diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 58ff2d7..86ae118 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,7 +107,7 @@ When an underlying runtime like [rive-ios](https://github.com/rive-app/rive-ios) Before running `yarn` at the root level of the project, set the appropriate version of the iOS runtime in `rive-react-native.podspec` at the root of the folder: ``` -s.dependency "RiveRuntime", "5.1.6" +s.dependency "RiveRuntime", "6.2.0" ``` In the example folder, run the following command to update the example project to retrieve the expected `RiveRuntime` dependency you're upgrading to: diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index d47c0d0..09c591c 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -489,8 +489,8 @@ PODS: - React-perflogger (= 0.72.7) - rive-react-native (7.3.0): - React-Core - - RiveRuntime (= 5.16.0) - - RiveRuntime (5.16.0) + - RiveRuntime (= 6.2.0) + - RiveRuntime (6.2.0) - RNCMaskedView (0.2.9): - React-Core - RNCPicker (1.16.8): @@ -744,8 +744,8 @@ SPEC CHECKSUMS: React-runtimescheduler: 7649c3b46c8dee1853691ecf60146a16ae59253c React-utils: 56838edeaaf651220d1e53cd0b8934fb8ce68415 ReactCommon: 5f704096ccf7733b390f59043b6fa9cc180ee4f6 - rive-react-native: 6f3125064bd7eb301343be4b4019938f22625d0b - RiveRuntime: ef01e938a098fbe2a98353145c2939e077556f06 + rive-react-native: cc732acaddbe1f38eadd5164133394490b9b1699 + RiveRuntime: 9e4b2a0e6a28808a27c6b8613364ac17b70c2168 RNCMaskedView: 949696f25ec596bfc697fc88e6f95cf0c79669b6 RNCPicker: 0991c56da7815c0cf946d6f63cf920b25296e5f6 RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 diff --git a/example/src/App.tsx b/example/src/App.tsx index 2411389..8059eef 100644 --- a/example/src/App.tsx +++ b/example/src/App.tsx @@ -30,7 +30,7 @@ export default function Main() { // For more information: https://rive.app/community/doc/overview/docD20dU9Rod // // This is optional. The current defaults are: - // - iOS: Skia + // - iOS: Rive // - Android: Skia // In the future the default will be the Rive Renderer (RiveRendererIOS.Rive and RiveRendererAndroid.Rive) // diff --git a/ios/RNRiveRendererType.swift b/ios/RNRiveRendererType.swift index 1444ccd..4f56976 100644 --- a/ios/RNRiveRendererType.swift +++ b/ios/RNRiveRendererType.swift @@ -10,9 +10,8 @@ import RiveRuntime enum RNRiveRendererType: String { case Rive = "rive" - case Skia = "skia" case CoreGraphics = "coreGraphics" - + static func mapToRNRiveRendererType(value: String) -> RNRiveRendererType { if let rnEnum = RNRiveRendererType(rawValue: value) { return rnEnum @@ -20,13 +19,11 @@ enum RNRiveRendererType: String { fatalError("Unsupported renderer type: \(value)") } } - + static func mapToRendererType(rnRendererType: RNRiveRendererType) -> RendererType { switch rnRendererType { case .Rive: return RendererType.riveRenderer - case .Skia: - return RendererType.skiaRenderer case .CoreGraphics: return RendererType.cgRenderer } diff --git a/rive-react-native-7.3.0.tgz b/rive-react-native-7.3.0.tgz index e9f861c..5ac2ab3 100644 Binary files a/rive-react-native-7.3.0.tgz and b/rive-react-native-7.3.0.tgz differ diff --git a/rive-react-native-v7.3.0.tgz b/rive-react-native-v7.3.0.tgz deleted file mode 100644 index fc42582..0000000 Binary files a/rive-react-native-v7.3.0.tgz and /dev/null differ diff --git a/rive-react-native.podspec b/rive-react-native.podspec index a247df4..433d1c2 100644 --- a/rive-react-native.podspec +++ b/rive-react-native.podspec @@ -18,5 +18,5 @@ Pod::Spec.new do |s| s.swift_version = "5.0" s.dependency "React-Core" - s.dependency "RiveRuntime", "5.16.0" + s.dependency "RiveRuntime", "6.2.0" end diff --git a/src/types.ts b/src/types.ts index 891c00a..cf3f590 100644 --- a/src/types.ts +++ b/src/types.ts @@ -78,7 +78,6 @@ export enum Direction { export enum RiveRendererIOS { Rive = 'rive', - Skia = 'skia', CoreGraphics = 'coreGraphics', }