Skip to content

Commit

Permalink
chore: upgrade to rive-ios 6.2, remove skia options
Browse files Browse the repository at this point in the history
chore: bring back Skia for Android
  • Loading branch information
lancesnider committed Oct 21, 2024
1 parent 3ffef1f commit fe4a857
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
//
Expand Down
7 changes: 2 additions & 5 deletions ios/RNRiveRendererType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,20 @@ 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
} else {
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
}
Expand Down
Binary file modified rive-react-native-7.3.0.tgz
Binary file not shown.
Binary file removed rive-react-native-v7.3.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion rive-react-native.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ export enum Direction {

export enum RiveRendererIOS {
Rive = 'rive',
Skia = 'skia',
CoreGraphics = 'coreGraphics',
}

Expand Down

0 comments on commit fe4a857

Please sign in to comment.