diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6147574e..fc8535a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: run: ./gradlew assembleDebug --no-daemon build-ios: - runs-on: ghcr.io/cirruslabs/macos-runner:sonoma + runs-on: macos-latest steps: - name: Checkout uses: actions/checkout@v5 diff --git a/android/build.gradle b/android/build.gradle index 80e3e105..41ba48c7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -158,6 +158,5 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1' implementation "app.rive:rive-android:${riveAndroidVersion}" - implementation "androidx.startup:startup-runtime:1.1.1" implementation 'com.android.volley:volley:1.2.0' } diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 22719338..6e3d24ba 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,18 +1,4 @@ - - - - - diff --git a/android/src/main/java/com/rivereactnative/RiveReactNativeRendererModule.kt b/android/src/main/java/com/rivereactnative/RiveReactNativeRendererModule.kt index c8454f6d..d0713765 100644 --- a/android/src/main/java/com/rivereactnative/RiveReactNativeRendererModule.kt +++ b/android/src/main/java/com/rivereactnative/RiveReactNativeRendererModule.kt @@ -8,6 +8,11 @@ import app.rive.runtime.kotlin.core.Rive class RiveReactNativeRendererModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) { override fun getName() = "RiveReactNativeRendererModule" + override fun initialize() { + super.initialize() + Rive.init(reactApplicationContext) + } + @ReactMethod fun defaultRenderer(iosRenderer: String, androidRenderer: String) { val rnRendererType = RNRiveRendererType.mapToRNRiveRendererType(androidRenderer); val rendererType = RNRiveRendererType.mapToRiveRendererType(rnRendererType); diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 8581f936..2a4d1013 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1692,8 +1692,8 @@ PODS: - React-utils (= 0.76.7) - rive-react-native (9.7.1): - React-Core - - RiveRuntime (= 6.13.0) - - RiveRuntime (6.13.0) + - RiveRuntime (= 6.15.2) + - RiveRuntime (6.15.2) - RNCPicker (2.11.0): - DoubleConversion - glog @@ -2163,7 +2163,7 @@ SPEC CHECKSUMS: fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a hermes-engine: eb4a80f6bf578536c58a44198ec93a30f6e69218 - RCT-Folly: 84578c8756030547307e4572ab1947de1685c599 + RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648 RCTDeprecation: 7691283dd69fed46f6653d376de6fa83aaad774c RCTRequired: eac044a04629288f272ee6706e31f81f3a2b4bfe RCTTypeSafety: cfe499e127eda6dd46e5080e12d80d0bfe667228 @@ -2222,14 +2222,14 @@ SPEC CHECKSUMS: React-utils: 0342746d2cf989cf5e0d1b84c98cfa152edbdf3f ReactCodegen: e1c019dc68733dd2c5d3b263b4a6dc72002c0045 ReactCommon: 81e0744ee33adfd6d586141b927024f488bc49ea - rive-react-native: 368b57cf974b87f309819be2f59c433876010e4a - RiveRuntime: 903690a5ba698b2a7e8d462e8aa7ceeba862614c + rive-react-native: 9f14e5bd0fc53537a6d04c0164163cc6bd994f94 + RiveRuntime: b2c29a7e1fbf2aabd1fffcb7b9cf43c4d515a841 RNCPicker: c657bd58a82b164a957812f82a0b4bab4245de2e RNGestureHandler: 16ef3dc2d7ecb09f240f25df5255953c4098819b RNReanimated: a2692304a6568bc656c04c8ffea812887d37436e RNScreens: 351f431ef2a042a1887d4d90e1c1024b8ae9d123 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 - Yoga: 90d80701b27946c4b23461c00a7207f300a6ff71 + Yoga: 88e46d0f2096eb9762a82c2c45ab23b0880de97d PODFILE CHECKSUM: 7111cb0109850378b078b31993e62f5f22d4dcde diff --git a/package.json b/package.json index db24a02f..a2a774f7 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "rive-react-native", "version": "9.8.0", "runtimeVersions": { - "ios": "6.13.0", - "android": "11.1.0" + "ios": "6.15.2", + "android": "11.2.0" }, "workspaces": [ "example"