diff --git a/package-lock.json b/package-lock.json index a80c838e89b..0c76cc88260 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97339,6 +97339,18 @@ "node": ">=8" } }, + "node_modules/rive-react-native": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/rive-react-native/-/rive-react-native-6.2.3.tgz", + "integrity": "sha512-oOhalZdCTCiSXDBR/YIYQtBmfunxKCZioCIjsQ/C+sd51b0G1hxk4TqDl4f0zE7iFC3y3k57G0aIL5+N+iYZhA==", + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/rlp": { "version": "2.2.7", "license": "MPL-2.0", @@ -141428,7 +141440,7 @@ "redux-saga": "1.1.3", "redux-thunk": "2.4.2", "reselect": "4.0.0", - "rive-react-native": "6.2.1", + "rive-react-native": "6.2.3", "rn-fetch-blob": "0.12.0", "semver": "7.3.7", "stream-browserify": "3.0.0", @@ -143456,18 +143468,6 @@ "node": ">=8.10.0" } }, - "packages/mobile/node_modules/rive-react-native": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/rive-react-native/-/rive-react-native-6.2.1.tgz", - "integrity": "sha512-s9FXUmL8Q4xN3fNeUrgeGqMKZW6DZ/6nAyqrsDNeGfFxR3MoXwiBNYjxRTGTNX3zDB0rymQuQslcpYky5tgvFA==", - "engines": { - "node": ">=16" - }, - "peerDependencies": { - "react": "*", - "react-native": "*" - } - }, "packages/mobile/node_modules/semver": { "version": "7.3.7", "license": "ISC", @@ -153007,7 +153007,7 @@ "@radix-ui/react-slot": "^1.0.2", "@react-spring/web": "^9.7.3", "@reduxjs/toolkit": "1.9.7", - "@safe-global/api-kit": "^2.1.0", + "@safe-global/api-kit": "2.1.0", "@self.id/3box-legacy": "0.3.0", "@self.id/core": "0.4.1", "@tanstack/react-query": "5.0.5", diff --git a/packages/mobile/ios/Podfile.lock b/packages/mobile/ios/Podfile.lock index d91a5d8f293..ed9400f4333 100644 --- a/packages/mobile/ios/Podfile.lock +++ b/packages/mobile/ios/Podfile.lock @@ -1220,7 +1220,7 @@ PODS: - React-jsi (= 0.73.1) - React-logger (= 0.73.1) - React-perflogger (= 0.73.1) - - rive-react-native (6.2.1): + - rive-react-native (6.2.3): - React-Core - RiveRuntime (= 5.5.1) - RiveRuntime (5.5.1) @@ -1418,7 +1418,7 @@ DEPENDENCIES: - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`) - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - rive-react-native (from `../node_modules/rive-react-native`) + - rive-react-native (from `../../../node_modules/rive-react-native`) - rn-fetch-blob (from `../../../node_modules/rn-fetch-blob`) - RNBootSplash (from `../node_modules/react-native-bootsplash`) - "RNCAsyncStorage (from `../../../node_modules/@react-native-async-storage/async-storage`)" @@ -1633,7 +1633,7 @@ EXTERNAL SOURCES: ReactCommon: :path: "../node_modules/react-native/ReactCommon" rive-react-native: - :path: "../node_modules/rive-react-native" + :path: "../../../node_modules/rive-react-native" rn-fetch-blob: :path: "../../../node_modules/rn-fetch-blob" RNBootSplash: @@ -1703,7 +1703,7 @@ SPEC CHECKSUMS: Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 FlipperKit: 9f6df8cb028c2acd537ce24c1993aba142eceaf0 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 035f1e36e53b355cf70f6434d161b36e7d21fecd + glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 google-cast-sdk-dynamic-xcframework-no-bluetooth: 09d47191ef8821d82e813e754bcf98bc61a3dbc9 hermes-engine: 34df9d5034e90bd9bf1505e1ca198760373935af JWT: ef71dfb03e1f842081e64dc42eef0e164f35d251 @@ -1778,7 +1778,7 @@ SPEC CHECKSUMS: React-runtimescheduler: 93a4c84e46a85c3fc9678abd4f6923b785226ea7 React-utils: debda2c206770ee2785bdebb7f16d8db9f18838a ReactCommon: ddb128564dcbfa0287d3d1a2d10f8c7457c971f6 - rive-react-native: 8d6918f6cf63e10d915c3bbc1d73871f4cdac1a1 + rive-react-native: 79777686cb29eaba6a28a0534fe82c8b8da41b4a RiveRuntime: b57830ff73f406f3b4022f457b16690535ca4d05 rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba RNBootSplash: f7fd5a7d4f1c13be3d0f5f31d27af7bcc1b1acef diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 4840ff9f9c5..3320a90472b 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -171,7 +171,7 @@ "redux-saga": "1.1.3", "redux-thunk": "2.4.2", "reselect": "4.0.0", - "rive-react-native": "6.2.1", + "rive-react-native": "6.2.3", "rn-fetch-blob": "0.12.0", "semver": "7.3.7", "stream-browserify": "3.0.0", diff --git a/packages/mobile/patches/rive-react-native+6.2.0.patch b/packages/mobile/patches/rive-react-native+6.2.0.patch deleted file mode 100644 index 53f3ca7e225..00000000000 --- a/packages/mobile/patches/rive-react-native+6.2.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/node_modules/rive-react-native/ios/RiveReactNative-Bridging-Header.h b/node_modules/rive-react-native/ios/RiveReactNative-Bridging-Header.h -index 5a2bb3f..373b1d7 100644 ---- a/node_modules/rive-react-native/ios/RiveReactNative-Bridging-Header.h -+++ b/node_modules/rive-react-native/ios/RiveReactNative-Bridging-Header.h -@@ -4,5 +4,6 @@ - #import "React/RCTUIManager.h" - #import - #import "React/RCTExceptionsManager.h" -+#import - - -diff --git a/node_modules/rive-react-native/ios/RiveReactNativeView.swift b/node_modules/rive-react-native/ios/RiveReactNativeView.swift -index 92d15b8..445f07f 100644 ---- a/node_modules/rive-react-native/ios/RiveReactNativeView.swift -+++ b/node_modules/rive-react-native/ios/RiveReactNativeView.swift -@@ -1,7 +1,7 @@ - import UIKit - import RiveRuntime - --class RiveReactNativeView: UIView, RivePlayerDelegate, RiveStateMachineDelegate { -+class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate { - // MARK: RiveReactNativeView Properties - private var resourceFromBundle = true - private var requiresLocalResourceReconfigure = false diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index 0cf1d042120..91966429658 100755 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -17,6 +17,6 @@ if [[ -z "${SKIP_POD_INSTALL}" ]]; then cd ../../.. fi -if [[ -z "${CI}" ]]; then - ./dev-tools/setup.sh -fi +# if [[ -z "${CI}" ]]; then +# ./dev-tools/setup.sh +# fi