From 39fd4e6e57cad141e640e4baf4ed3f60eccd6db4 Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sat, 13 Apr 2024 15:44:45 +0200 Subject: [PATCH 01/10] feat: add support for new React Native architecture - Migrated unsupported APIs - enabled the new architecture for the iOS example app with MapKit. --- example/ios/Podfile.lock | 103 +++++++++++++++--- .../ios/rnmshowcase.xcodeproj/project.pbxproj | 16 ++- example/ios/rnmshowcase/AppDelegate.mm | 18 ++- example/react-native.config.js | 18 +++ src/decorateMapComponent.ts | 2 +- 5 files changed, 132 insertions(+), 25 deletions(-) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index bed05e40c7..29955d79b9 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -3,13 +3,6 @@ PODS: - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - FBLazyVector (0.73.6) - - FBReactNativeSpec (0.73.6): - - RCT-Folly (= 2022.05.16.00) - - RCTRequired (= 0.73.6) - - RCTTypeSafety (= 0.73.6) - - React-Core (= 0.73.6) - - React-jsi (= 0.73.6) - - ReactCommon/turbomodule/core (= 0.73.6) - Flipper (0.201.0): - Flipper-Folly (~> 2.6) - Flipper-Boost-iOSX (1.76.0.1.11) @@ -140,17 +133,21 @@ PODS: - React-callinvoker (0.73.6) - React-Codegen (0.73.6): - DoubleConversion - - FBReactNativeSpec - glog - hermes-engine - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core + - React-debug + - React-Fabric + - React-FabricImage + - React-graphics - React-jsi - React-jsiexecutor - React-NativeModulesApple - - React-rncore + - React-rendererdebug + - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - React-Core (0.73.6): @@ -963,6 +960,8 @@ PODS: - React-jsi (= 0.73.6) - React-perflogger (= 0.73.6) - React-jsinspector (0.73.6) + - React-jsitracing (0.73.6): + - React-jsi - React-logger (0.73.6): - glog - React-Mapbuffer (0.73.6): @@ -1002,13 +1001,21 @@ PODS: - RCTTypeSafety - React-Core - React-CoreModules + - React-debug + - React-Fabric + - React-graphics - React-hermes - React-nativeconfig - React-NativeModulesApple - React-RCTFabric - React-RCTImage - React-RCTNetwork + - React-rendererdebug + - React-RuntimeApple + - React-RuntimeCore + - React-RuntimeHermes - React-runtimescheduler + - React-utils - ReactCommon - React-RCTBlob (0.73.6): - hermes-engine @@ -1086,8 +1093,42 @@ PODS: - RCT-Folly (= 2022.05.16.00) - React-debug - React-rncore (0.73.6) + - React-RuntimeApple (0.73.6): + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - React-callinvoker + - React-Core/Default + - React-CoreModules + - React-cxxreact + - React-jserrorhandler + - React-jsi + - React-jsiexecutor + - React-Mapbuffer + - React-NativeModulesApple + - React-RCTFabric + - React-RuntimeCore + - React-runtimeexecutor + - React-RuntimeHermes + - React-utils + - React-RuntimeCore (0.73.6): + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - React-cxxreact + - React-jserrorhandler + - React-jsi + - React-jsiexecutor + - React-runtimeexecutor + - React-runtimescheduler - React-runtimeexecutor (0.73.6): - React-jsi (= 0.73.6) + - React-RuntimeHermes (0.73.6): + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - React-jsi + - React-jsitracing + - React-nativeconfig + - React-utils - React-runtimescheduler (0.73.6): - glog - hermes-engine @@ -1143,9 +1184,23 @@ PODS: - React-perflogger (= 0.73.6) - RNReanimated (3.8.1): - glog + - hermes-engine - RCT-Folly (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Codegen - React-Core + - React-debug + - React-Fabric + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core + - Yoga - SocketRocket (0.6.1) - Yoga (1.14.0) @@ -1153,7 +1208,6 @@ DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - Flipper (= 0.201.0) - Flipper-Boost-iOSX (= 1.76.0.1.11) - Flipper-DoubleConversion (= 3.2.0.1) @@ -1200,6 +1254,7 @@ DEPENDENCIES: - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector-modern`) + - React-jsitracing (from `../node_modules/react-native/ReactCommon/hermes/executor/`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`) - react-native-google-maps (from `../..`) @@ -1220,7 +1275,10 @@ DEPENDENCIES: - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - React-rendererdebug (from `../node_modules/react-native/ReactCommon/react/renderer/debug`) - React-rncore (from `../node_modules/react-native/ReactCommon`) + - React-RuntimeApple (from `../node_modules/react-native/ReactCommon/react/runtime/platform/ios`) + - React-RuntimeCore (from `../node_modules/react-native/ReactCommon/react/runtime`) - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) + - React-RuntimeHermes (from `../node_modules/react-native/ReactCommon/react/runtime`) - 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`) @@ -1252,8 +1310,6 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" FBLazyVector: :path: "../node_modules/react-native/Libraries/FBLazyVector" - FBReactNativeSpec: - :path: "../node_modules/react-native/React/FBReactNativeSpec" glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" hermes-engine: @@ -1297,6 +1353,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsiexecutor" React-jsinspector: :path: "../node_modules/react-native/ReactCommon/jsinspector-modern" + React-jsitracing: + :path: "../node_modules/react-native/ReactCommon/hermes/executor/" React-logger: :path: "../node_modules/react-native/ReactCommon/logger" React-Mapbuffer: @@ -1337,8 +1395,14 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/react/renderer/debug" React-rncore: :path: "../node_modules/react-native/ReactCommon" + React-RuntimeApple: + :path: "../node_modules/react-native/ReactCommon/react/runtime/platform/ios" + React-RuntimeCore: + :path: "../node_modules/react-native/ReactCommon/react/runtime" React-runtimeexecutor: :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" + React-RuntimeHermes: + :path: "../node_modules/react-native/ReactCommon/react/runtime" React-runtimescheduler: :path: "../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler" React-utils: @@ -1355,7 +1419,6 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864 - FBReactNativeSpec: 9f2b8b243131565335437dba74923a8d3015e780 Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -1376,7 +1439,7 @@ SPEC CHECKSUMS: RCTTypeSafety: 678e344fb976ff98343ca61dc62e151f3a042292 React: e296bcebb489deaad87326067204eb74145934ab React-callinvoker: d0b7015973fa6ccb592bb0363f6bc2164238ab8c - React-Codegen: f034a5de6f28e15e8d95d171df17e581d5309268 + React-Codegen: df86ee5fa0498fb4d1c7e6ac324a58b7fdffbbaa React-Core: 44c936d0ab879e9c32e5381bd7596a677c59c974 React-CoreModules: 558228e12cddb9ca00ff7937894cc5104a21be6b React-cxxreact: 1fcf565012c203655b3638f35aa03c13c2ed7e9e @@ -1390,6 +1453,7 @@ SPEC CHECKSUMS: React-jsi: ae102ccb38d2e4d0f512b7074d0c9b4e1851f402 React-jsiexecutor: bd12ec75873d3ef0a755c11f878f2c420430f5a9 React-jsinspector: 85583ef014ce53d731a98c66a0e24496f7a83066 + React-jsitracing: 4fed160d939e93a39049481f47744af246a7ac2c React-logger: 3eb80a977f0d9669468ef641a5e1fabbc50a09ec React-Mapbuffer: 84ea43c6c6232049135b1550b8c60b2faac19fab react-native-google-maps: 031abe9680dd5f1f4450beff976d98b1228c087f @@ -1399,9 +1463,9 @@ SPEC CHECKSUMS: React-perflogger: 5f49905de275bac07ac7ea7f575a70611fa988f2 React-RCTActionSheet: 37edf35aeb8e4f30e76c82aab61f12d1b75c04ec React-RCTAnimation: a69de7f3daa8462743094f4736c455e844ea63f7 - React-RCTAppDelegate: 51fb96b554a6acd0cd7818acecd5aa5ca2f3ab9f + React-RCTAppDelegate: 5d3238045cfc5d6b157550e62c3cb6e2f7f2a5a6 React-RCTBlob: d91771caebf2d015005d750cd1dc2b433ad07c99 - React-RCTFabric: c5b9451d1f2b546119b7a0353226a8a26247d4a9 + React-RCTFabric: 910a000f2470943ef39edc606f065fb61b138401 React-RCTImage: a0bfe87b6908c7b76bd7d74520f40660bd0ad881 React-RCTLinking: 5f10be1647952cceddfa1970fdb374087582fc34 React-RCTNetwork: a0bc3dd45a2dc7c879c80cebb6f9707b2c8bbed6 @@ -1409,12 +1473,15 @@ SPEC CHECKSUMS: React-RCTText: 4119d9e53ca5db9502b916e1b146e99798986d21 React-RCTVibration: 55bd7c48487eb9a2562f2bd3fdc833274f5b0636 React-rendererdebug: 5fa97ba664806cee4700e95aec42dff1b6f8ea36 - React-rncore: b0a8e1d14dabb7115c7a5b4ec8b9b74d1727d382 + React-rncore: a3534bcdcf253f7ecc1f0ee36bfe8f4035ea1432 + React-RuntimeApple: c9886b8729f1e2fd5a551e54c617391d5172140e + React-RuntimeCore: 17e41e15c4933e0a127317e8ba0e582210a24fdc React-runtimeexecutor: bb328dbe2865f3a550df0240df8e2d8c3aaa4c57 + React-RuntimeHermes: a4a1f5e24555292aa6a5f176fc41ad51878220d3 React-runtimescheduler: 9636eee762c699ca7c85751a359101797e4c8b3b React-utils: d16c1d2251c088ad817996621947d0ac8167b46c ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10 - RNReanimated: 8a4d86eb951a4a99d8e86266dc71d7735c0c30a9 + RNReanimated: 323436b1a5364dca3b5f8b1a13458455e0de9efe SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: 805bf71192903b20fc14babe48080582fee65a80 diff --git a/example/ios/rnmshowcase.xcodeproj/project.pbxproj b/example/ios/rnmshowcase.xcodeproj/project.pbxproj index 86a8a46437..237dfed486 100644 --- a/example/ios/rnmshowcase.xcodeproj/project.pbxproj +++ b/example/ios/rnmshowcase.xcodeproj/project.pbxproj @@ -500,7 +500,7 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "org.reactjs.salah-maps"; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = org.reactjs.native.example.rnmshowcases; PRODUCT_NAME = rnmshowcase; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -528,7 +528,7 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "org.reactjs.salah-maps"; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = org.reactjs.native.example.rnmshowcases; PRODUCT_NAME = rnmshowcase; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -607,12 +607,16 @@ ); MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = "$(inherited) "; + OTHER_CFLAGS = ( + "$(inherited)", + "-DRN_FABRIC_ENABLED", + ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", + "-DRN_FABRIC_ENABLED", ); OTHER_LDFLAGS = "$(inherited)"; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; @@ -685,12 +689,16 @@ "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = "$(inherited) "; + OTHER_CFLAGS = ( + "$(inherited)", + "-DRN_FABRIC_ENABLED", + ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", + "-DRN_FABRIC_ENABLED", ); OTHER_LDFLAGS = "$(inherited)"; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; diff --git a/example/ios/rnmshowcase/AppDelegate.mm b/example/ios/rnmshowcase/AppDelegate.mm index da66e74ae8..ab5ee6d372 100644 --- a/example/ios/rnmshowcase/AppDelegate.mm +++ b/example/ios/rnmshowcase/AppDelegate.mm @@ -13,11 +13,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( { [GMSServices provideAPIKey:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"MAPS_API_KEY"]]; self.moduleName = @"rnmshowcase"; - + // You can add your custom initial props in the dictionary below. // They will be passed down to the ViewController used by React Native. self.initialProps = @{}; - + return [super application:application didFinishLaunchingWithOptions:launchOptions]; } @@ -35,5 +35,19 @@ - (NSURL *)getBundleURL #endif } +- (BOOL)turboModuleEnabled { + return true; +} + + +- (BOOL)fabricEnabled{ + return true; +} + +- (BOOL)bridgelessEnabled +{ + return YES; +} + @end diff --git a/example/react-native.config.js b/example/react-native.config.js index a5166956f4..3a33b10fcf 100644 --- a/example/react-native.config.js +++ b/example/react-native.config.js @@ -7,4 +7,22 @@ module.exports = { root: path.join(__dirname, '..'), }, }, + project: { + ios: { + unstable_reactLegacyComponentNames: [ + 'AIRMap', + 'AIRMapCallout', + 'AIRMapCalloutSubview', + 'AIRMapCircle', + 'AIRMapHeatmap', + 'AIRMapLocalTile', + 'AIRMapMarker', + 'AIRMapOverlay', + 'AIRMapPolygon', + 'AIRMapPolyline', + 'AIRMapUrlTile', + 'AIRMapWMSTile', + ], + }, + }, }; diff --git a/src/decorateMapComponent.ts b/src/decorateMapComponent.ts index ff06c6416a..c16dee7206 100644 --- a/src/decorateMapComponent.ts +++ b/src/decorateMapComponent.ts @@ -47,7 +47,7 @@ export const createNotSupportedComponent = (message: string) => () => { return null; }; -export const googleMapIsInstalled = !!UIManager.getViewManagerConfig( +export const googleMapIsInstalled = !!UIManager.hasViewManagerConfig( getNativeMapName(PROVIDER_GOOGLE), ); From 1310985e6e2c0d5b915d7364cf52a99cca43ec8f Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sat, 13 Apr 2024 16:56:45 +0200 Subject: [PATCH 02/10] feat: add support for new React Native architecture - example for android is working as well --- example/android/gradle.properties | 2 +- example/react-native.config.js | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/example/android/gradle.properties b/example/android/gradle.properties index a46a5b90fa..99fc223edf 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -34,7 +34,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # your application. You should enable this flag either if you want # to write custom TurboModules/Fabric components OR use libraries that # are providing them. -newArchEnabled=false +newArchEnabled=true # Use this property to enable or disable the Hermes JS engine. # If set to false, you will be using JSC instead. diff --git a/example/react-native.config.js b/example/react-native.config.js index 3a33b10fcf..4224096cb9 100644 --- a/example/react-native.config.js +++ b/example/react-native.config.js @@ -8,6 +8,22 @@ module.exports = { }, }, project: { + android: { + unstable_reactLegacyComponentNames: [ + 'AIRMap', + 'AIRMapCallout', + 'AIRMapCalloutSubview', + 'AIRMapCircle', + 'AIRMapHeatmap', + 'AIRMapLocalTile', + 'AIRMapMarker', + 'AIRMapOverlay', + 'AIRMapPolygon', + 'AIRMapPolyline', + 'AIRMapUrlTile', + 'AIRMapWMSTile', + ], + }, ios: { unstable_reactLegacyComponentNames: [ 'AIRMap', From 794c64f9288310a8da0bb5450011a8ef6236b952 Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sat, 13 Apr 2024 17:33:53 +0200 Subject: [PATCH 03/10] feat: add support for new React Native architecture - increase android build memory --- example/android/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 99fc223edf..ed1e6169a4 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -10,7 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m -org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m +org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit From 6554793a0287060dd946edae0a92de3482c2b14d Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sat, 13 Apr 2024 19:33:34 +0200 Subject: [PATCH 04/10] fix(android): map initialization as expected - attempting to fix the android CI by version bumping reanimated, reset cache --- example/ios/Podfile.lock | 4 ++-- example/package.json | 8 ++++---- example/yarn.lock | 31 +++++++++++++++++-------------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 29955d79b9..c0b87070ef 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1182,7 +1182,7 @@ PODS: - React-jsi (= 0.73.6) - React-logger (= 0.73.6) - React-perflogger (= 0.73.6) - - RNReanimated (3.8.1): + - RNReanimated (3.7.2): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -1481,7 +1481,7 @@ SPEC CHECKSUMS: React-runtimescheduler: 9636eee762c699ca7c85751a359101797e4c8b3b React-utils: d16c1d2251c088ad817996621947d0ac8167b46c ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10 - RNReanimated: 323436b1a5364dca3b5f8b1a13458455e0de9efe + RNReanimated: 51db0fff543694d931bd3b7cab1a3b36bd86c738 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: 805bf71192903b20fc14babe48080582fee65a80 diff --git a/example/package.json b/example/package.json index 288d52ba87..5b4b421f50 100644 --- a/example/package.json +++ b/example/package.json @@ -12,18 +12,18 @@ "dependencies": { "react": "18.2.0", "react-native": "0.73.6", - "react-native-reanimated": "^3.7.0" + "react-native-reanimated": "3.7.2" }, "devDependencies": { "@babel/core": "^7.20.0", - "@babel/runtime": "^7.20.0", "@babel/preset-env": "^7.20.0", - "babel-plugin-module-resolver": "5.0.0", + "@babel/runtime": "^7.20.0", "@react-native/babel-preset": "0.73.21", "@react-native/eslint-config": "0.73.2", "@react-native/metro-config": "0.73.5", "@react-native/typescript-config": "0.73.1", "@types/react": "^18.2.6", - "@types/react-test-renderer": "^18.0.0" + "@types/react-test-renderer": "^18.0.0", + "babel-plugin-module-resolver": "5.0.0" } } diff --git a/example/yarn.lock b/example/yarn.lock index d5e7c60b30..e9695b82a8 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -521,7 +521,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.0.0-0", "@babel/plugin-transform-arrow-functions@^7.24.1": +"@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.24.1": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz#2bf263617060c9cc45bcdbf492b8cc805082bf27" integrity sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw== @@ -751,7 +751,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.24.0" -"@babel/plugin-transform-nullish-coalescing-operator@^7.0.0-0", "@babel/plugin-transform-nullish-coalescing-operator@^7.24.1": +"@babel/plugin-transform-nullish-coalescing-operator@^7.24.1": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz#0cd494bb97cb07d428bd651632cb9d4140513988" integrity sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw== @@ -767,6 +767,13 @@ "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-syntax-numeric-separator" "^7.10.4" +"@babel/plugin-transform-object-assign@^7.16.7": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.24.1.tgz#46a70169e56970aafd13a6ae677d5b497fc227e7" + integrity sha512-I1kctor9iKtupb7jv7FyjApHCuKLBKCblVAeHVK9PB6FW7GI0ac6RtobC3MwwJy8CZ1JxuhQmnbrsqI5G8hAIg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/plugin-transform-object-rest-spread@^7.24.1": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz#5a3ce73caf0e7871a02e1c31e8b473093af241ff" @@ -793,7 +800,7 @@ "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-transform-optional-chaining@^7.0.0-0", "@babel/plugin-transform-optional-chaining@^7.24.1": +"@babel/plugin-transform-optional-chaining@^7.24.1": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz#26e588acbedce1ab3519ac40cc748e380c5291e6" integrity sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg== @@ -893,7 +900,7 @@ babel-plugin-polyfill-regenerator "^0.6.1" semver "^6.3.1" -"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.0.0-0", "@babel/plugin-transform-shorthand-properties@^7.24.1": +"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.24.1": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz#ba9a09144cf55d35ec6b93a32253becad8ee5b55" integrity sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA== @@ -915,7 +922,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.24.0" -"@babel/plugin-transform-template-literals@^7.0.0-0", "@babel/plugin-transform-template-literals@^7.24.1": +"@babel/plugin-transform-template-literals@^7.24.1": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz#15e2166873a30d8617e3e2ccadb86643d327aab7" integrity sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g== @@ -4539,16 +4546,12 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-native-reanimated@^3.7.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.8.1.tgz#45c13d4bedebef8df3d5a8756f25072de65960d7" - integrity sha512-EdM0vr3JEaNtqvstqESaPfOBy0gjYBkr1iEolWJ82Ax7io8y9OVUIphgsLKTB36CtR1XtmBw0RZVj7KArc7ZVA== +react-native-reanimated@3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.7.2.tgz#688a0002d129a8ddcef919093c45c67de18923f5" + integrity sha512-3KpTmYEcmHhkZeTqgWtioqnljpd4TLxKHClvarYsA3UXU2Tv+O1gqlRhVhfHBZuiDngVu436gWkde9+/VQVMFQ== dependencies: - "@babel/plugin-transform-arrow-functions" "^7.0.0-0" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.0.0-0" - "@babel/plugin-transform-optional-chaining" "^7.0.0-0" - "@babel/plugin-transform-shorthand-properties" "^7.0.0-0" - "@babel/plugin-transform-template-literals" "^7.0.0-0" + "@babel/plugin-transform-object-assign" "^7.16.7" "@babel/preset-typescript" "^7.16.7" convert-source-map "^2.0.0" invariant "^2.2.4" From 73640a6232f7e523c8962f6ab315bc9772ae154c Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sat, 13 Apr 2024 19:34:22 +0200 Subject: [PATCH 05/10] fix(android): map initialization as expected - attempting to fix the android CI by version bumping reanimated, reset cache --- .github/workflows/androidBuild.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/androidBuild.yml b/.github/workflows/androidBuild.yml index 0cc461d030..7646865ab7 100644 --- a/.github/workflows/androidBuild.yml +++ b/.github/workflows/androidBuild.yml @@ -24,6 +24,9 @@ jobs: - name: Check out repository code uses: actions/checkout@v3 + - name: Clear Gradle Cache + run: rm -rf $HOME/.gradle/caches/ + - name: Setup node uses: actions/setup-node@v3 with: From 7e1dd58e3bf3ea174e0a526926b14ef38340a195 Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sat, 13 Apr 2024 20:22:08 +0200 Subject: [PATCH 06/10] fix(android): map initialization as expected - attempting to fix CI by removing support for arm64-v8a for the example project --- example/android/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/android/gradle.properties b/example/android/gradle.properties index ed1e6169a4..18386bdd2c 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -27,7 +27,7 @@ android.enableJetifier=true # Use this property to specify which architecture you want to build. # You can also override it from the CLI using # ./gradlew -PreactNativeArchitectures=x86_64 -reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 +reactNativeArchitectures=armeabi-v7a,x86,x86_64 # Use this property to enable support to the new architecture. # This will allow you to use TurboModules and the Fabric render in From 8ba7608e90d188ee8bad50392968c60c5a2f15be Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sat, 13 Apr 2024 20:50:57 +0200 Subject: [PATCH 07/10] fix(android): map initialization as expected - using pickFirst for now --- example/android/app/build.gradle | 15 +++++++++++++++ example/android/gradle.properties | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index b00ef6dd76..2b717eb937 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -102,6 +102,21 @@ android { proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } } + packagingOptions { + // MPAndroidChart uses androidX - remove this line when we migrate everything to androidX + exclude 'META-INF/proguard/androidx-annotations.pro' + + // Exclude React Native's JSC and Fabric JNI + exclude '**/libjscexecutor.so' + exclude '**/libfabricjni.so' + + // Avoid React Native's JNI duplicated classes + pickFirst '**/libc++_shared.so' + pickFirst '**/libfbjni.so' + + pickFirst 'META-INF/-no-jdk.kotlin_module' + + } } dependencies { diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 18386bdd2c..ed1e6169a4 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -27,7 +27,7 @@ android.enableJetifier=true # Use this property to specify which architecture you want to build. # You can also override it from the CLI using # ./gradlew -PreactNativeArchitectures=x86_64 -reactNativeArchitectures=armeabi-v7a,x86,x86_64 +reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # Use this property to enable support to the new architecture. # This will allow you to use TurboModules and the Fabric render in From b57d22f887f352d7be636b3cc9b60be8254ab850 Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sat, 13 Apr 2024 21:12:45 +0200 Subject: [PATCH 08/10] fix(android): map initialization as expected - pickfirst for all instead of exclude --- example/android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 2b717eb937..e51a207a65 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -107,8 +107,8 @@ android { exclude 'META-INF/proguard/androidx-annotations.pro' // Exclude React Native's JSC and Fabric JNI - exclude '**/libjscexecutor.so' - exclude '**/libfabricjni.so' + pickFirst '**/libjscexecutor.so' + pickFirst '**/libfabricjni.so' // Avoid React Native's JNI duplicated classes pickFirst '**/libc++_shared.so' From 48665da2a581d300557d40fe740b8a28bb1cdc43 Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sun, 14 Apr 2024 14:15:27 +0200 Subject: [PATCH 09/10] feat: add support for new React Native architecture - pickFirst .so / c++ libs from android builds - exclude META-INF --- android/build.gradle | 9 +++++++++ example/android/app/build.gradle | 14 -------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 68e5ba960c..247faffb2b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -37,6 +37,15 @@ android { buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() } + packagingOptions { + excludes = [ + "META-INF", + "META-INF/**", + ] + jniLibs { + pickFirsts += ['**/*.so'] + } + } } repositories { diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index e51a207a65..b1a912d164 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -102,21 +102,7 @@ android { proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } } - packagingOptions { - // MPAndroidChart uses androidX - remove this line when we migrate everything to androidX - exclude 'META-INF/proguard/androidx-annotations.pro' - // Exclude React Native's JSC and Fabric JNI - pickFirst '**/libjscexecutor.so' - pickFirst '**/libfabricjni.so' - - // Avoid React Native's JNI duplicated classes - pickFirst '**/libc++_shared.so' - pickFirst '**/libfbjni.so' - - pickFirst 'META-INF/-no-jdk.kotlin_module' - - } } dependencies { From 630b72ef90c2bcb8611ce907c4f359eefe40c555 Mon Sep 17 00:00:00 2001 From: salah ghanim Date: Sun, 14 Apr 2024 14:49:39 +0200 Subject: [PATCH 10/10] feat: add support for new React Native architecture - remove reanimated from example due to import issues - update dependencies --- android/build.gradle | 3 - example/babel.config.js | 1 - example/ios/Podfile.lock | 689 +++++++++--------- .../ios/rnmshowcase.xcodeproj/project.pbxproj | 16 +- example/package.json | 3 +- example/src/examples/AnimatedMarkers.tsx | 123 ++-- example/yarn.lock | 19 +- 7 files changed, 408 insertions(+), 446 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 247faffb2b..cc4453151c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -42,9 +42,6 @@ android { "META-INF", "META-INF/**", ] - jniLibs { - pickFirsts += ['**/*.so'] - } } } diff --git a/example/babel.config.js b/example/babel.config.js index 378ae5d227..204c84c937 100644 --- a/example/babel.config.js +++ b/example/babel.config.js @@ -7,7 +7,6 @@ module.exports = { ['@babel/preset-typescript', {allowDeclareFields: true}], // to allow use of declare context ], plugins: [ - 'react-native-reanimated/plugin', [ 'module-resolver', { diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index c0b87070ef..1066bf692a 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -2,7 +2,7 @@ PODS: - boost (1.83.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.73.6) + - FBLazyVector (0.73.0) - Flipper (0.201.0): - Flipper-Folly (~> 2.6) - Flipper-Boost-iOSX (1.76.0.1.11) @@ -85,9 +85,9 @@ PODS: - GoogleMaps/Base (7.4.0) - GoogleMaps/Maps (7.4.0): - GoogleMaps/Base - - hermes-engine (0.73.6): - - hermes-engine/Pre-built (= 0.73.6) - - hermes-engine/Pre-built (0.73.6) + - hermes-engine (0.73.0): + - hermes-engine/Pre-built (= 0.73.0) + - hermes-engine/Pre-built (0.73.0) - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - RCT-Folly (2022.05.16.00): @@ -112,26 +112,26 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.73.6) - - RCTTypeSafety (0.73.6): - - FBLazyVector (= 0.73.6) - - RCTRequired (= 0.73.6) - - React-Core (= 0.73.6) - - React (0.73.6): - - React-Core (= 0.73.6) - - React-Core/DevSupport (= 0.73.6) - - React-Core/RCTWebSocket (= 0.73.6) - - React-RCTActionSheet (= 0.73.6) - - React-RCTAnimation (= 0.73.6) - - React-RCTBlob (= 0.73.6) - - React-RCTImage (= 0.73.6) - - React-RCTLinking (= 0.73.6) - - React-RCTNetwork (= 0.73.6) - - React-RCTSettings (= 0.73.6) - - React-RCTText (= 0.73.6) - - React-RCTVibration (= 0.73.6) - - React-callinvoker (0.73.6) - - React-Codegen (0.73.6): + - RCTRequired (0.73.0) + - RCTTypeSafety (0.73.0): + - FBLazyVector (= 0.73.0) + - RCTRequired (= 0.73.0) + - React-Core (= 0.73.0) + - React (0.73.0): + - React-Core (= 0.73.0) + - React-Core/DevSupport (= 0.73.0) + - React-Core/RCTWebSocket (= 0.73.0) + - React-RCTActionSheet (= 0.73.0) + - React-RCTAnimation (= 0.73.0) + - React-RCTBlob (= 0.73.0) + - React-RCTImage (= 0.73.0) + - React-RCTLinking (= 0.73.0) + - React-RCTNetwork (= 0.73.0) + - React-RCTSettings (= 0.73.0) + - React-RCTText (= 0.73.0) + - React-RCTVibration (= 0.73.0) + - React-callinvoker (0.73.0) + - React-Codegen (0.73.0): - DoubleConversion - glog - hermes-engine @@ -150,11 +150,11 @@ PODS: - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.73.6): + - React-Core (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-Core/Default (= 0.73.6) + - React-Core/Default (= 0.73.0) - React-cxxreact - React-hermes - React-jsi @@ -164,7 +164,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/CoreModulesHeaders (0.73.6): + - React-Core/CoreModulesHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -178,7 +178,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/Default (0.73.6): + - React-Core/Default (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -191,23 +191,23 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/DevSupport (0.73.6): + - React-Core/DevSupport (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-Core/Default (= 0.73.6) - - React-Core/RCTWebSocket (= 0.73.6) + - React-Core/Default (= 0.73.0) + - React-Core/RCTWebSocket (= 0.73.0) - React-cxxreact - React-hermes - React-jsi - React-jsiexecutor - - React-jsinspector (= 0.73.6) + - React-jsinspector (= 0.73.0) - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTActionSheetHeaders (0.73.6): + - React-Core/RCTActionSheetHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -221,7 +221,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTAnimationHeaders (0.73.6): + - React-Core/RCTAnimationHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -235,7 +235,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTBlobHeaders (0.73.6): + - React-Core/RCTBlobHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -249,7 +249,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTImageHeaders (0.73.6): + - React-Core/RCTImageHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -263,7 +263,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTLinkingHeaders (0.73.6): + - React-Core/RCTLinkingHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -277,7 +277,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTNetworkHeaders (0.73.6): + - React-Core/RCTNetworkHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -291,7 +291,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTSettingsHeaders (0.73.6): + - React-Core/RCTSettingsHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -305,7 +305,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTTextHeaders (0.73.6): + - React-Core/RCTTextHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -319,7 +319,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTVibrationHeaders (0.73.6): + - React-Core/RCTVibrationHeaders (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -333,11 +333,11 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTWebSocket (0.73.6): + - React-Core/RCTWebSocket (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-Core/Default (= 0.73.6) + - React-Core/Default (= 0.73.0) - React-cxxreact - React-hermes - React-jsi @@ -347,33 +347,33 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-CoreModules (0.73.6): + - React-CoreModules (0.73.0): - RCT-Folly (= 2022.05.16.00) - - RCTTypeSafety (= 0.73.6) + - RCTTypeSafety (= 0.73.0) - React-Codegen - - React-Core/CoreModulesHeaders (= 0.73.6) - - React-jsi (= 0.73.6) + - React-Core/CoreModulesHeaders (= 0.73.0) + - React-jsi (= 0.73.0) - React-NativeModulesApple - React-RCTBlob - - React-RCTImage (= 0.73.6) + - React-RCTImage (= 0.73.0) - ReactCommon - SocketRocket (= 0.6.1) - - React-cxxreact (0.73.6): + - React-cxxreact (0.73.0): - boost (= 1.83.0) - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.6) - - React-debug (= 0.73.6) - - React-jsi (= 0.73.6) - - React-jsinspector (= 0.73.6) - - React-logger (= 0.73.6) - - React-perflogger (= 0.73.6) - - React-runtimeexecutor (= 0.73.6) - - React-debug (0.73.6) - - React-Fabric (0.73.6): + - React-callinvoker (= 0.73.0) + - React-debug (= 0.73.0) + - React-jsi (= 0.73.0) + - React-jsinspector (= 0.73.0) + - React-logger (= 0.73.0) + - React-perflogger (= 0.73.0) + - React-runtimeexecutor (= 0.73.0) + - React-debug (0.73.0) + - React-Fabric (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -384,20 +384,20 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/animations (= 0.73.6) - - React-Fabric/attributedstring (= 0.73.6) - - React-Fabric/componentregistry (= 0.73.6) - - React-Fabric/componentregistrynative (= 0.73.6) - - React-Fabric/components (= 0.73.6) - - React-Fabric/core (= 0.73.6) - - React-Fabric/imagemanager (= 0.73.6) - - React-Fabric/leakchecker (= 0.73.6) - - React-Fabric/mounting (= 0.73.6) - - React-Fabric/scheduler (= 0.73.6) - - React-Fabric/telemetry (= 0.73.6) - - React-Fabric/templateprocessor (= 0.73.6) - - React-Fabric/textlayoutmanager (= 0.73.6) - - React-Fabric/uimanager (= 0.73.6) + - React-Fabric/animations (= 0.73.0) + - React-Fabric/attributedstring (= 0.73.0) + - React-Fabric/componentregistry (= 0.73.0) + - React-Fabric/componentregistrynative (= 0.73.0) + - React-Fabric/components (= 0.73.0) + - React-Fabric/core (= 0.73.0) + - React-Fabric/imagemanager (= 0.73.0) + - React-Fabric/leakchecker (= 0.73.0) + - React-Fabric/mounting (= 0.73.0) + - React-Fabric/scheduler (= 0.73.0) + - React-Fabric/telemetry (= 0.73.0) + - React-Fabric/templateprocessor (= 0.73.0) + - React-Fabric/textlayoutmanager (= 0.73.0) + - React-Fabric/uimanager (= 0.73.0) - React-graphics - React-jsi - React-jsiexecutor @@ -406,7 +406,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/animations (0.73.6): + - React-Fabric/animations (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -425,7 +425,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/attributedstring (0.73.6): + - React-Fabric/attributedstring (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -444,7 +444,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistry (0.73.6): + - React-Fabric/componentregistry (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -463,7 +463,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistrynative (0.73.6): + - React-Fabric/componentregistrynative (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -482,7 +482,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components (0.73.6): + - React-Fabric/components (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -493,17 +493,17 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/components/inputaccessory (= 0.73.6) - - React-Fabric/components/legacyviewmanagerinterop (= 0.73.6) - - React-Fabric/components/modal (= 0.73.6) - - React-Fabric/components/rncore (= 0.73.6) - - React-Fabric/components/root (= 0.73.6) - - React-Fabric/components/safeareaview (= 0.73.6) - - React-Fabric/components/scrollview (= 0.73.6) - - React-Fabric/components/text (= 0.73.6) - - React-Fabric/components/textinput (= 0.73.6) - - React-Fabric/components/unimplementedview (= 0.73.6) - - React-Fabric/components/view (= 0.73.6) + - React-Fabric/components/inputaccessory (= 0.73.0) + - React-Fabric/components/legacyviewmanagerinterop (= 0.73.0) + - React-Fabric/components/modal (= 0.73.0) + - React-Fabric/components/rncore (= 0.73.0) + - React-Fabric/components/root (= 0.73.0) + - React-Fabric/components/safeareaview (= 0.73.0) + - React-Fabric/components/scrollview (= 0.73.0) + - React-Fabric/components/text (= 0.73.0) + - React-Fabric/components/textinput (= 0.73.0) + - React-Fabric/components/unimplementedview (= 0.73.0) + - React-Fabric/components/view (= 0.73.0) - React-graphics - React-jsi - React-jsiexecutor @@ -512,7 +512,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/inputaccessory (0.73.6): + - React-Fabric/components/inputaccessory (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -531,7 +531,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/legacyviewmanagerinterop (0.73.6): + - React-Fabric/components/legacyviewmanagerinterop (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -550,7 +550,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/modal (0.73.6): + - React-Fabric/components/modal (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -569,7 +569,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/rncore (0.73.6): + - React-Fabric/components/rncore (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -588,7 +588,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/root (0.73.6): + - React-Fabric/components/root (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -607,7 +607,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/safeareaview (0.73.6): + - React-Fabric/components/safeareaview (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -626,7 +626,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/scrollview (0.73.6): + - React-Fabric/components/scrollview (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -645,7 +645,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/text (0.73.6): + - React-Fabric/components/text (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -664,7 +664,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/textinput (0.73.6): + - React-Fabric/components/textinput (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -683,7 +683,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/unimplementedview (0.73.6): + - React-Fabric/components/unimplementedview (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -702,7 +702,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/view (0.73.6): + - React-Fabric/components/view (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -722,7 +722,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-Fabric/core (0.73.6): + - React-Fabric/core (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -741,7 +741,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/imagemanager (0.73.6): + - React-Fabric/imagemanager (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -760,7 +760,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/leakchecker (0.73.6): + - React-Fabric/leakchecker (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -779,7 +779,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/mounting (0.73.6): + - React-Fabric/mounting (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -798,7 +798,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/scheduler (0.73.6): + - React-Fabric/scheduler (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -817,7 +817,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/telemetry (0.73.6): + - React-Fabric/telemetry (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -836,7 +836,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/templateprocessor (0.73.6): + - React-Fabric/templateprocessor (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -855,7 +855,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/textlayoutmanager (0.73.6): + - React-Fabric/textlayoutmanager (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -875,7 +875,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/uimanager (0.73.6): + - React-Fabric/uimanager (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -894,42 +894,42 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-FabricImage (0.73.6): + - React-FabricImage (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - - RCTRequired (= 0.73.6) - - RCTTypeSafety (= 0.73.6) + - RCTRequired (= 0.73.0) + - RCTTypeSafety (= 0.73.0) - React-Fabric - React-graphics - React-ImageManager - React-jsi - - React-jsiexecutor (= 0.73.6) + - React-jsiexecutor (= 0.73.0) - React-logger - React-rendererdebug - React-utils - ReactCommon - Yoga - - React-graphics (0.73.6): + - React-graphics (0.73.0): - glog - RCT-Folly/Fabric (= 2022.05.16.00) - - React-Core/Default (= 0.73.6) + - React-Core/Default (= 0.73.0) - React-utils - - React-hermes (0.73.6): + - React-hermes (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - RCT-Folly/Futures (= 2022.05.16.00) - - React-cxxreact (= 0.73.6) + - React-cxxreact (= 0.73.0) - React-jsi - - React-jsiexecutor (= 0.73.6) - - React-jsinspector (= 0.73.6) - - React-perflogger (= 0.73.6) - - React-ImageManager (0.73.6): + - React-jsiexecutor (= 0.73.0) + - React-jsinspector (= 0.73.0) + - React-perflogger (= 0.73.0) + - React-ImageManager (0.73.0): - glog - RCT-Folly/Fabric - React-Core/Default @@ -938,33 +938,33 @@ PODS: - React-graphics - React-rendererdebug - React-utils - - React-jserrorhandler (0.73.6): + - React-jserrorhandler (0.73.0): - RCT-Folly/Fabric (= 2022.05.16.00) - React-debug - React-jsi - React-Mapbuffer - - React-jsi (0.73.6): + - React-jsi (0.73.0): - boost (= 1.83.0) - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-jsiexecutor (0.73.6): + - React-jsiexecutor (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-cxxreact (= 0.73.6) - - React-jsi (= 0.73.6) - - React-perflogger (= 0.73.6) - - React-jsinspector (0.73.6) - - React-jsitracing (0.73.6): + - React-cxxreact (= 0.73.0) + - React-jsi (= 0.73.0) + - React-perflogger (= 0.73.0) + - React-jsinspector (0.73.0) + - React-jsitracing (0.73.0): - React-jsi - - React-logger (0.73.6): + - React-logger (0.73.0): - glog - - React-Mapbuffer (0.73.6): + - React-Mapbuffer (0.73.0): - glog - React-debug - react-native-google-maps (0.0.0): @@ -973,8 +973,8 @@ PODS: - React-Core - react-native-maps (0.0.0): - React-Core - - React-nativeconfig (0.73.6) - - React-NativeModulesApple (0.73.6): + - React-nativeconfig (0.73.0) + - React-NativeModulesApple (0.73.0): - glog - hermes-engine - React-callinvoker @@ -984,10 +984,10 @@ PODS: - React-runtimeexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-perflogger (0.73.6) - - React-RCTActionSheet (0.73.6): - - React-Core/RCTActionSheetHeaders (= 0.73.6) - - React-RCTAnimation (0.73.6): + - React-perflogger (0.73.0) + - React-RCTActionSheet (0.73.0): + - React-Core/RCTActionSheetHeaders (= 0.73.0) + - React-RCTAnimation (0.73.0): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -995,7 +995,7 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTAppDelegate (0.73.6): + - React-RCTAppDelegate (0.73.0): - RCT-Folly - RCTRequired - RCTTypeSafety @@ -1017,7 +1017,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon - - React-RCTBlob (0.73.6): + - React-RCTBlob (0.73.0): - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Codegen @@ -1027,7 +1027,7 @@ PODS: - React-NativeModulesApple - React-RCTNetwork - ReactCommon - - React-RCTFabric (0.73.6): + - React-RCTFabric (0.73.0): - glog - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) @@ -1045,7 +1045,7 @@ PODS: - React-runtimescheduler - React-utils - Yoga - - React-RCTImage (0.73.6): + - React-RCTImage (0.73.0): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1054,14 +1054,14 @@ PODS: - React-NativeModulesApple - React-RCTNetwork - ReactCommon - - React-RCTLinking (0.73.6): + - React-RCTLinking (0.73.0): - React-Codegen - - React-Core/RCTLinkingHeaders (= 0.73.6) - - React-jsi (= 0.73.6) + - React-Core/RCTLinkingHeaders (= 0.73.0) + - React-jsi (= 0.73.0) - React-NativeModulesApple - ReactCommon - - ReactCommon/turbomodule/core (= 0.73.6) - - React-RCTNetwork (0.73.6): + - ReactCommon/turbomodule/core (= 0.73.0) + - React-RCTNetwork (0.73.0): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1069,7 +1069,7 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTSettings (0.73.6): + - React-RCTSettings (0.73.0): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1077,23 +1077,23 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTText (0.73.6): - - React-Core/RCTTextHeaders (= 0.73.6) + - React-RCTText (0.73.0): + - React-Core/RCTTextHeaders (= 0.73.0) - Yoga - - React-RCTVibration (0.73.6): + - React-RCTVibration (0.73.0): - RCT-Folly (= 2022.05.16.00) - React-Codegen - React-Core/RCTVibrationHeaders - React-jsi - React-NativeModulesApple - ReactCommon - - React-rendererdebug (0.73.6): + - React-rendererdebug (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - RCT-Folly (= 2022.05.16.00) - React-debug - - React-rncore (0.73.6) - - React-RuntimeApple (0.73.6): + - React-rncore (0.73.0) + - React-RuntimeApple (0.73.0): - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - React-callinvoker @@ -1110,7 +1110,7 @@ PODS: - React-runtimeexecutor - React-RuntimeHermes - React-utils - - React-RuntimeCore (0.73.6): + - React-RuntimeCore (0.73.0): - glog - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) @@ -1120,16 +1120,16 @@ PODS: - React-jsiexecutor - React-runtimeexecutor - React-runtimescheduler - - React-runtimeexecutor (0.73.6): - - React-jsi (= 0.73.6) - - React-RuntimeHermes (0.73.6): + - React-runtimeexecutor (0.73.0): + - React-jsi (= 0.73.0) + - React-RuntimeHermes (0.73.0): - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - React-jsi - React-jsitracing - React-nativeconfig - React-utils - - React-runtimescheduler (0.73.6): + - React-runtimescheduler (0.73.0): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -1140,74 +1140,55 @@ PODS: - React-rendererdebug - React-runtimeexecutor - React-utils - - React-utils (0.73.6): + - React-utils (0.73.0): - glog - RCT-Folly (= 2022.05.16.00) - React-debug - - ReactCommon (0.73.6): - - React-logger (= 0.73.6) - - ReactCommon/turbomodule (= 0.73.6) - - ReactCommon/turbomodule (0.73.6): + - ReactCommon (0.73.0): + - React-logger (= 0.73.0) + - ReactCommon/turbomodule (= 0.73.0) + - ReactCommon/turbomodule (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.6) - - React-cxxreact (= 0.73.6) - - React-jsi (= 0.73.6) - - React-logger (= 0.73.6) - - React-perflogger (= 0.73.6) - - ReactCommon/turbomodule/bridging (= 0.73.6) - - ReactCommon/turbomodule/core (= 0.73.6) - - ReactCommon/turbomodule/bridging (0.73.6): + - React-callinvoker (= 0.73.0) + - React-cxxreact (= 0.73.0) + - React-jsi (= 0.73.0) + - React-logger (= 0.73.0) + - React-perflogger (= 0.73.0) + - ReactCommon/turbomodule/bridging (= 0.73.0) + - ReactCommon/turbomodule/core (= 0.73.0) + - ReactCommon/turbomodule/bridging (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.6) - - React-cxxreact (= 0.73.6) - - React-jsi (= 0.73.6) - - React-logger (= 0.73.6) - - React-perflogger (= 0.73.6) - - ReactCommon/turbomodule/core (0.73.6): + - React-callinvoker (= 0.73.0) + - React-cxxreact (= 0.73.0) + - React-jsi (= 0.73.0) + - React-logger (= 0.73.0) + - React-perflogger (= 0.73.0) + - ReactCommon/turbomodule/core (0.73.0): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.6) - - React-cxxreact (= 0.73.6) - - React-jsi (= 0.73.6) - - React-logger (= 0.73.6) - - React-perflogger (= 0.73.6) - - RNReanimated (3.7.2): - - glog - - hermes-engine - - RCT-Folly (= 2022.05.16.00) - - RCTRequired - - RCTTypeSafety - - React-Codegen - - React-Core - - React-debug - - React-Fabric - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga + - React-callinvoker (= 0.73.0) + - React-cxxreact (= 0.73.0) + - React-jsi (= 0.73.0) + - React-logger (= 0.73.0) + - React-perflogger (= 0.73.0) - SocketRocket (0.6.1) - Yoga (1.14.0) DEPENDENCIES: - - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) + - boost (from `../../node_modules/react-native/third-party-podspecs/boost.podspec`) + - DoubleConversion (from `../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) + - FBLazyVector (from `../../node_modules/react-native/Libraries/FBLazyVector`) - Flipper (= 0.201.0) - Flipper-Boost-iOSX (= 1.76.0.1.11) - Flipper-DoubleConversion (= 3.2.0.1) @@ -1228,62 +1209,61 @@ DEPENDENCIES: - FlipperKit/FlipperKitReactPlugin (= 0.201.0) - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.201.0) - FlipperKit/SKIOSNetworkPlugin (= 0.201.0) - - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`) + - glog (from `../../node_modules/react-native/third-party-podspecs/glog.podspec`) + - hermes-engine (from `../../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`) - libevent (~> 2.1.12) - OpenSSL-Universal (= 1.1.1100) - - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - - React (from `../node_modules/react-native/`) - - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) + - RCT-Folly (from `../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) + - RCT-Folly/Fabric (from `../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) + - RCTRequired (from `../../node_modules/react-native/Libraries/RCTRequired`) + - RCTTypeSafety (from `../../node_modules/react-native/Libraries/TypeSafety`) + - React (from `../../node_modules/react-native/`) + - React-callinvoker (from `../../node_modules/react-native/ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - - React-Core (from `../node_modules/react-native/`) - - React-Core/DevSupport (from `../node_modules/react-native/`) - - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) - - React-debug (from `../node_modules/react-native/ReactCommon/react/debug`) - - React-Fabric (from `../node_modules/react-native/ReactCommon`) - - React-FabricImage (from `../node_modules/react-native/ReactCommon`) - - React-graphics (from `../node_modules/react-native/ReactCommon/react/renderer/graphics`) - - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`) - - React-ImageManager (from `../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios`) - - React-jserrorhandler (from `../node_modules/react-native/ReactCommon/jserrorhandler`) - - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector-modern`) - - React-jsitracing (from `../node_modules/react-native/ReactCommon/hermes/executor/`) - - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`) + - React-Core (from `../../node_modules/react-native/`) + - React-Core/DevSupport (from `../../node_modules/react-native/`) + - React-Core/RCTWebSocket (from `../../node_modules/react-native/`) + - React-CoreModules (from `../../node_modules/react-native/React/CoreModules`) + - React-cxxreact (from `../../node_modules/react-native/ReactCommon/cxxreact`) + - React-debug (from `../../node_modules/react-native/ReactCommon/react/debug`) + - React-Fabric (from `../../node_modules/react-native/ReactCommon`) + - React-FabricImage (from `../../node_modules/react-native/ReactCommon`) + - React-graphics (from `../../node_modules/react-native/ReactCommon/react/renderer/graphics`) + - React-hermes (from `../../node_modules/react-native/ReactCommon/hermes`) + - React-ImageManager (from `../../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios`) + - React-jserrorhandler (from `../../node_modules/react-native/ReactCommon/jserrorhandler`) + - React-jsi (from `../../node_modules/react-native/ReactCommon/jsi`) + - React-jsiexecutor (from `../../node_modules/react-native/ReactCommon/jsiexecutor`) + - React-jsinspector (from `../../node_modules/react-native/ReactCommon/jsinspector-modern`) + - React-jsitracing (from `../../node_modules/react-native/ReactCommon/hermes/executor/`) + - React-logger (from `../../node_modules/react-native/ReactCommon/logger`) + - React-Mapbuffer (from `../../node_modules/react-native/ReactCommon`) - react-native-google-maps (from `../..`) - react-native-maps (from `../..`) - - React-nativeconfig (from `../node_modules/react-native/ReactCommon`) - - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) - - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) - - React-RCTAppDelegate (from `../node_modules/react-native/Libraries/AppDelegate`) - - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) - - React-RCTFabric (from `../node_modules/react-native/React`) - - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) - - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) - - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - - React-rendererdebug (from `../node_modules/react-native/ReactCommon/react/renderer/debug`) - - React-rncore (from `../node_modules/react-native/ReactCommon`) - - React-RuntimeApple (from `../node_modules/react-native/ReactCommon/react/runtime/platform/ios`) - - React-RuntimeCore (from `../node_modules/react-native/ReactCommon/react/runtime`) - - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - - React-RuntimeHermes (from `../node_modules/react-native/ReactCommon/react/runtime`) - - 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`) - - RNReanimated (from `../node_modules/react-native-reanimated`) - - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) + - React-nativeconfig (from `../../node_modules/react-native/ReactCommon`) + - React-NativeModulesApple (from `../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) + - React-perflogger (from `../../node_modules/react-native/ReactCommon/reactperflogger`) + - React-RCTActionSheet (from `../../node_modules/react-native/Libraries/ActionSheetIOS`) + - React-RCTAnimation (from `../../node_modules/react-native/Libraries/NativeAnimation`) + - React-RCTAppDelegate (from `../../node_modules/react-native/Libraries/AppDelegate`) + - React-RCTBlob (from `../../node_modules/react-native/Libraries/Blob`) + - React-RCTFabric (from `../../node_modules/react-native/React`) + - React-RCTImage (from `../../node_modules/react-native/Libraries/Image`) + - React-RCTLinking (from `../../node_modules/react-native/Libraries/LinkingIOS`) + - React-RCTNetwork (from `../../node_modules/react-native/Libraries/Network`) + - React-RCTSettings (from `../../node_modules/react-native/Libraries/Settings`) + - React-RCTText (from `../../node_modules/react-native/Libraries/Text`) + - React-RCTVibration (from `../../node_modules/react-native/Libraries/Vibration`) + - React-rendererdebug (from `../../node_modules/react-native/ReactCommon/react/renderer/debug`) + - React-rncore (from `../../node_modules/react-native/ReactCommon`) + - React-RuntimeApple (from `../../node_modules/react-native/ReactCommon/react/runtime/platform/ios`) + - React-RuntimeCore (from `../../node_modules/react-native/ReactCommon/react/runtime`) + - React-runtimeexecutor (from `../../node_modules/react-native/ReactCommon/runtimeexecutor`) + - React-RuntimeHermes (from `../../node_modules/react-native/ReactCommon/react/runtime`) + - 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`) + - Yoga (from `../../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: trunk: @@ -1305,120 +1285,118 @@ SPEC REPOS: EXTERNAL SOURCES: boost: - :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" + :podspec: "../../node_modules/react-native/third-party-podspecs/boost.podspec" DoubleConversion: - :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" + :podspec: "../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" FBLazyVector: - :path: "../node_modules/react-native/Libraries/FBLazyVector" + :path: "../../node_modules/react-native/Libraries/FBLazyVector" glog: - :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + :podspec: "../../node_modules/react-native/third-party-podspecs/glog.podspec" hermes-engine: - :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" - :tag: hermes-2024-02-20-RNv0.73.5-18f99ace4213052c5e7cdbcd39ee9766cd5df7e4 + :podspec: "../../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" + :tag: hermes-2023-11-17-RNv0.73.0-21043a3fc062be445e56a2c10ecd8be028dd9cc5 RCT-Folly: - :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" + :podspec: "../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: - :path: "../node_modules/react-native/Libraries/RCTRequired" + :path: "../../node_modules/react-native/Libraries/RCTRequired" RCTTypeSafety: - :path: "../node_modules/react-native/Libraries/TypeSafety" + :path: "../../node_modules/react-native/Libraries/TypeSafety" React: - :path: "../node_modules/react-native/" + :path: "../../node_modules/react-native/" React-callinvoker: - :path: "../node_modules/react-native/ReactCommon/callinvoker" + :path: "../../node_modules/react-native/ReactCommon/callinvoker" React-Codegen: :path: build/generated/ios React-Core: - :path: "../node_modules/react-native/" + :path: "../../node_modules/react-native/" React-CoreModules: - :path: "../node_modules/react-native/React/CoreModules" + :path: "../../node_modules/react-native/React/CoreModules" React-cxxreact: - :path: "../node_modules/react-native/ReactCommon/cxxreact" + :path: "../../node_modules/react-native/ReactCommon/cxxreact" React-debug: - :path: "../node_modules/react-native/ReactCommon/react/debug" + :path: "../../node_modules/react-native/ReactCommon/react/debug" React-Fabric: - :path: "../node_modules/react-native/ReactCommon" + :path: "../../node_modules/react-native/ReactCommon" React-FabricImage: - :path: "../node_modules/react-native/ReactCommon" + :path: "../../node_modules/react-native/ReactCommon" React-graphics: - :path: "../node_modules/react-native/ReactCommon/react/renderer/graphics" + :path: "../../node_modules/react-native/ReactCommon/react/renderer/graphics" React-hermes: - :path: "../node_modules/react-native/ReactCommon/hermes" + :path: "../../node_modules/react-native/ReactCommon/hermes" React-ImageManager: - :path: "../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios" + :path: "../../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios" React-jserrorhandler: - :path: "../node_modules/react-native/ReactCommon/jserrorhandler" + :path: "../../node_modules/react-native/ReactCommon/jserrorhandler" React-jsi: - :path: "../node_modules/react-native/ReactCommon/jsi" + :path: "../../node_modules/react-native/ReactCommon/jsi" React-jsiexecutor: - :path: "../node_modules/react-native/ReactCommon/jsiexecutor" + :path: "../../node_modules/react-native/ReactCommon/jsiexecutor" React-jsinspector: - :path: "../node_modules/react-native/ReactCommon/jsinspector-modern" + :path: "../../node_modules/react-native/ReactCommon/jsinspector-modern" React-jsitracing: - :path: "../node_modules/react-native/ReactCommon/hermes/executor/" + :path: "../../node_modules/react-native/ReactCommon/hermes/executor/" React-logger: - :path: "../node_modules/react-native/ReactCommon/logger" + :path: "../../node_modules/react-native/ReactCommon/logger" React-Mapbuffer: - :path: "../node_modules/react-native/ReactCommon" + :path: "../../node_modules/react-native/ReactCommon" react-native-google-maps: :path: "../.." react-native-maps: :path: "../.." React-nativeconfig: - :path: "../node_modules/react-native/ReactCommon" + :path: "../../node_modules/react-native/ReactCommon" React-NativeModulesApple: - :path: "../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios" + :path: "../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios" React-perflogger: - :path: "../node_modules/react-native/ReactCommon/reactperflogger" + :path: "../../node_modules/react-native/ReactCommon/reactperflogger" React-RCTActionSheet: - :path: "../node_modules/react-native/Libraries/ActionSheetIOS" + :path: "../../node_modules/react-native/Libraries/ActionSheetIOS" React-RCTAnimation: - :path: "../node_modules/react-native/Libraries/NativeAnimation" + :path: "../../node_modules/react-native/Libraries/NativeAnimation" React-RCTAppDelegate: - :path: "../node_modules/react-native/Libraries/AppDelegate" + :path: "../../node_modules/react-native/Libraries/AppDelegate" React-RCTBlob: - :path: "../node_modules/react-native/Libraries/Blob" + :path: "../../node_modules/react-native/Libraries/Blob" React-RCTFabric: - :path: "../node_modules/react-native/React" + :path: "../../node_modules/react-native/React" React-RCTImage: - :path: "../node_modules/react-native/Libraries/Image" + :path: "../../node_modules/react-native/Libraries/Image" React-RCTLinking: - :path: "../node_modules/react-native/Libraries/LinkingIOS" + :path: "../../node_modules/react-native/Libraries/LinkingIOS" React-RCTNetwork: - :path: "../node_modules/react-native/Libraries/Network" + :path: "../../node_modules/react-native/Libraries/Network" React-RCTSettings: - :path: "../node_modules/react-native/Libraries/Settings" + :path: "../../node_modules/react-native/Libraries/Settings" React-RCTText: - :path: "../node_modules/react-native/Libraries/Text" + :path: "../../node_modules/react-native/Libraries/Text" React-RCTVibration: - :path: "../node_modules/react-native/Libraries/Vibration" + :path: "../../node_modules/react-native/Libraries/Vibration" React-rendererdebug: - :path: "../node_modules/react-native/ReactCommon/react/renderer/debug" + :path: "../../node_modules/react-native/ReactCommon/react/renderer/debug" React-rncore: - :path: "../node_modules/react-native/ReactCommon" + :path: "../../node_modules/react-native/ReactCommon" React-RuntimeApple: - :path: "../node_modules/react-native/ReactCommon/react/runtime/platform/ios" + :path: "../../node_modules/react-native/ReactCommon/react/runtime/platform/ios" React-RuntimeCore: - :path: "../node_modules/react-native/ReactCommon/react/runtime" + :path: "../../node_modules/react-native/ReactCommon/react/runtime" React-runtimeexecutor: - :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" + :path: "../../node_modules/react-native/ReactCommon/runtimeexecutor" React-RuntimeHermes: - :path: "../node_modules/react-native/ReactCommon/react/runtime" + :path: "../../node_modules/react-native/ReactCommon/react/runtime" React-runtimescheduler: - :path: "../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler" + :path: "../../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler" React-utils: - :path: "../node_modules/react-native/ReactCommon/react/utils" + :path: "../../node_modules/react-native/ReactCommon/react/utils" ReactCommon: - :path: "../node_modules/react-native/ReactCommon" - RNReanimated: - :path: "../node_modules/react-native-reanimated" + :path: "../../node_modules/react-native/ReactCommon" Yoga: - :path: "../node_modules/react-native/ReactCommon/yoga" + :path: "../../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - boost: d3f49c53809116a5d38da093a8aa78bf551aed09 + boost: 26fad476bfa736552bbfa698a06cc530475c1505 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 - FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864 + FBLazyVector: 39ba45baf4e398618f8b3a4bb6ba8fcdb7fc2133 Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -1431,59 +1409,58 @@ SPEC CHECKSUMS: glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac - hermes-engine: 9cecf9953a681df7556b8cc9c74905de8f3293c0 + hermes-engine: 34304f8c6e8fa68f63a5fe29af82f227d817d7a7 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0 - RCTRequired: ca1d7414aba0b27efcfa2ccd37637edb1ab77d96 - RCTTypeSafety: 678e344fb976ff98343ca61dc62e151f3a042292 - React: e296bcebb489deaad87326067204eb74145934ab - React-callinvoker: d0b7015973fa6ccb592bb0363f6bc2164238ab8c - React-Codegen: df86ee5fa0498fb4d1c7e6ac324a58b7fdffbbaa - React-Core: 44c936d0ab879e9c32e5381bd7596a677c59c974 - React-CoreModules: 558228e12cddb9ca00ff7937894cc5104a21be6b - React-cxxreact: 1fcf565012c203655b3638f35aa03c13c2ed7e9e - React-debug: d444db402065cca460d9c5b072caab802a04f729 - React-Fabric: 7d11905695e42f8bdaedddcf294959b43b290ab8 - React-FabricImage: 6e06a512d2fb5f55669c721578736785d915d4f5 - React-graphics: 5500206f7c9a481456365403c9fcf1638de108b7 - React-hermes: 783023e43af9d6be4fbaeeb96b5beee00649a5f7 - React-ImageManager: df193215ff3cf1a8dad297e554c89c632e42436c - React-jserrorhandler: a4d0f541c5852cf031db2f82f51de90be55b1334 - React-jsi: ae102ccb38d2e4d0f512b7074d0c9b4e1851f402 - React-jsiexecutor: bd12ec75873d3ef0a755c11f878f2c420430f5a9 - React-jsinspector: 85583ef014ce53d731a98c66a0e24496f7a83066 - React-jsitracing: 4fed160d939e93a39049481f47744af246a7ac2c - React-logger: 3eb80a977f0d9669468ef641a5e1fabbc50a09ec - React-Mapbuffer: 84ea43c6c6232049135b1550b8c60b2faac19fab + RCTRequired: 5e3631b27c08716986980ef23eed8abdee1cdcaf + RCTTypeSafety: 02a64828b0b428eb4f63de1397d44fb2d0747e85 + React: df5dbfbd10c5bd8d4bcb49bd9830551533e11c7e + React-callinvoker: dc0dff59e8d3d1fe4cd9fb5f120f82a775d2a325 + React-Codegen: 275e184adb9bd1a1ef7755d4f2b3ee8121493ee9 + React-Core: 276ccbbf282538138f4429313bb1200a15067c6e + React-CoreModules: 64747180c0329bebed8307ffdc97c331220277a6 + React-cxxreact: 84d98283f701bae882dcd3ad7c573a02f4c9d5c0 + React-debug: 443cf46ade52f3555dd1ec709718793490ac5edc + React-Fabric: 4c877c032b3acc07ed3f2e46ae25b5a39af89382 + React-FabricImage: c46c47ea3c672b9fadd6850795a51d3d9e5df712 + React-graphics: e1cff03acf09098513642535324432d495b6425c + React-hermes: e3356f82c76c5c41688a7e08ced2254a944501c4 + React-ImageManager: c783771479ab0bf1e3dbe711cc8b9f5b0f65972b + React-jserrorhandler: 7cd93ce5165e5d66c87b6f612f94e5642f5c5028 + React-jsi: 81b5fe94500e69051c2f3a775308afaa53e2608b + React-jsiexecutor: 4f790f865ad23fa949396c1a103d06867c0047ed + React-jsinspector: 9f6fb9ed9f03a0fb961ab8dc2e0e0ee0dc729e77 + React-jsitracing: c4f0d56beda781bc3ce6e3594c9f7117f04b37a1 + React-logger: 008caec0d6a587abc1e71be21bfac5ba1662fe6a + React-Mapbuffer: 58fe558faf52ecde6705376700f848d0293d1cef react-native-google-maps: 031abe9680dd5f1f4450beff976d98b1228c087f react-native-maps: 30d24060fb0abe9998d31a4cf37421ff14c59e25 - React-nativeconfig: b4d4e9901d4cabb57be63053fd2aa6086eb3c85f - React-NativeModulesApple: cd26e56d56350e123da0c1e3e4c76cb58a05e1ee - React-perflogger: 5f49905de275bac07ac7ea7f575a70611fa988f2 - React-RCTActionSheet: 37edf35aeb8e4f30e76c82aab61f12d1b75c04ec - React-RCTAnimation: a69de7f3daa8462743094f4736c455e844ea63f7 - React-RCTAppDelegate: 5d3238045cfc5d6b157550e62c3cb6e2f7f2a5a6 - React-RCTBlob: d91771caebf2d015005d750cd1dc2b433ad07c99 - React-RCTFabric: 910a000f2470943ef39edc606f065fb61b138401 - React-RCTImage: a0bfe87b6908c7b76bd7d74520f40660bd0ad881 - React-RCTLinking: 5f10be1647952cceddfa1970fdb374087582fc34 - React-RCTNetwork: a0bc3dd45a2dc7c879c80cebb6f9707b2c8bbed6 - React-RCTSettings: 28c202b68afa59afb4067510f2c69c5a530fb9e3 - React-RCTText: 4119d9e53ca5db9502b916e1b146e99798986d21 - React-RCTVibration: 55bd7c48487eb9a2562f2bd3fdc833274f5b0636 - React-rendererdebug: 5fa97ba664806cee4700e95aec42dff1b6f8ea36 - React-rncore: a3534bcdcf253f7ecc1f0ee36bfe8f4035ea1432 - React-RuntimeApple: c9886b8729f1e2fd5a551e54c617391d5172140e - React-RuntimeCore: 17e41e15c4933e0a127317e8ba0e582210a24fdc - React-runtimeexecutor: bb328dbe2865f3a550df0240df8e2d8c3aaa4c57 - React-RuntimeHermes: a4a1f5e24555292aa6a5f176fc41ad51878220d3 - React-runtimescheduler: 9636eee762c699ca7c85751a359101797e4c8b3b - React-utils: d16c1d2251c088ad817996621947d0ac8167b46c - ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10 - RNReanimated: 51db0fff543694d931bd3b7cab1a3b36bd86c738 + React-nativeconfig: a063483672b8add47a4875b0281e202908ff6747 + React-NativeModulesApple: 169506a5fd708ab22811f76ee06a976595c367a1 + React-perflogger: b61e5db8e5167f5e70366e820766c492847c082e + React-RCTActionSheet: dcaecff7ffc1888972cd1c1935751ff3bce1e0c1 + React-RCTAnimation: 24b8ae7ebc897ba3f33a93a020bbc66ab7863f5d + React-RCTAppDelegate: a6de16b274cb25098a5960cc5e21a5bb4ff07a8b + React-RCTBlob: 112880abc731c5a0d8eefb5919a591ad30f630e8 + React-RCTFabric: a0289e3bf73da8c03b68b4e9733ba497b021de45 + React-RCTImage: b8065c1b51cc6c2ff58ad81001619352518dd793 + React-RCTLinking: fdf9f43f8bd763d178281a079700105674953849 + React-RCTNetwork: ad3d988e425288492510ee37c9dcdf8259566214 + React-RCTSettings: 67c3876f2775d1cf86298f657e6006afc2a2e4cf + React-RCTText: 671518da40bd548943ec12ee6a60f733a751e2e9 + React-RCTVibration: 60bc4d01d7d8ab7cff14852a195a7fa93b38e1f3 + React-rendererdebug: 6aaab394c9fefe395ef61809580a9bf63b98fd3e + React-rncore: 89dce547cdf87ba254d9c45b91ca4bba481de383 + React-RuntimeApple: e16e0101da3586958bb6be48940f43211ae9eb0b + React-RuntimeCore: fce65e9a37b1e5b9b59ab2f72ce8cb82ddbaf69d + React-runtimeexecutor: 2ca6f02d3fd6eea5b9575eb30720cf12c5d89906 + React-RuntimeHermes: f730d6ac60dee9de505cdd25572f132d93d24fb0 + React-runtimescheduler: 77543c74df984ce56c09d49d427149c53784aaf6 + React-utils: 42708ea436853045ef1eaff29996813d9fbbe209 + ReactCommon: 851280fb976399ca1aabc74cc2c3612069ea70a2 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - Yoga: 805bf71192903b20fc14babe48080582fee65a80 + Yoga: 44003f970aa541b79dfdd59cf236fda41bd5890f PODFILE CHECKSUM: 417f449e48abef232f50f4a62d20ff4840d057ce diff --git a/example/ios/rnmshowcase.xcodeproj/project.pbxproj b/example/ios/rnmshowcase.xcodeproj/project.pbxproj index 237dfed486..9ccd1bc452 100644 --- a/example/ios/rnmshowcase.xcodeproj/project.pbxproj +++ b/example/ios/rnmshowcase.xcodeproj/project.pbxproj @@ -618,8 +618,12 @@ "-DFOLLY_USE_LIBCPP=1", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = "$(inherited)"; - REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; }; @@ -700,8 +704,12 @@ "-DFOLLY_USE_LIBCPP=1", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = "$(inherited)"; - REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; VALIDATE_PRODUCT = YES; diff --git a/example/package.json b/example/package.json index 5b4b421f50..6b8bbbff42 100644 --- a/example/package.json +++ b/example/package.json @@ -11,8 +11,7 @@ }, "dependencies": { "react": "18.2.0", - "react-native": "0.73.6", - "react-native-reanimated": "3.7.2" + "react-native": "0.73.6" }, "devDependencies": { "@babel/core": "^7.20.0", diff --git a/example/src/examples/AnimatedMarkers.tsx b/example/src/examples/AnimatedMarkers.tsx index 64f3acbe38..049c72110e 100644 --- a/example/src/examples/AnimatedMarkers.tsx +++ b/example/src/examples/AnimatedMarkers.tsx @@ -1,88 +1,83 @@ -import React, {useRef} from 'react'; +import React from 'react'; import { StyleSheet, View, Text, Dimensions, TouchableOpacity, + Platform, } from 'react-native'; -import MapView, {MapMarker, Marker} from 'react-native-maps'; -import { - runOnJS, - useDerivedValue, - useSharedValue, - withTiming, -} from 'react-native-reanimated'; + +import MapView, {Marker, AnimatedRegion} from 'react-native-maps'; const screen = Dimensions.get('window'); + const ASPECT_RATIO = screen.width / screen.height; const LATITUDE = 37.78825; const LONGITUDE = -122.4324; const LATITUDE_DELTA = 0.0922; const LONGITUDE_DELTA = LATITUDE_DELTA * ASPECT_RATIO; -const AnimatedMarkers = () => { - const markerRef = useRef(null); - // Shared values for latitude and longitude - const latitude = useSharedValue(LATITUDE); - const longitude = useSharedValue(LONGITUDE); +class AnimatedMarkers extends React.Component { + marker: any; + constructor(props: any) { + super(props); - // Function to animate marker position - const animateMarkerPosition = () => { - const newLatitude = LATITUDE + (Math.random() - 0.5) * (LATITUDE_DELTA / 2); - const newLongitude = - LONGITUDE + (Math.random() - 0.5) * (LONGITUDE_DELTA / 2); + this.state = { + coordinate: new AnimatedRegion({ + latitude: LATITUDE, + longitude: LONGITUDE, + }), + }; + } - latitude.value = withTiming(newLatitude, {duration: 1000}); - longitude.value = withTiming(newLongitude, {duration: 1000}); - }; + animate() { + const {coordinate} = this.state; + const newCoordinate = { + latitude: LATITUDE + (Math.random() - 0.5) * (LATITUDE_DELTA / 2), + longitude: LONGITUDE + (Math.random() - 0.5) * (LONGITUDE_DELTA / 2), + }; - // Derived value to trigger marker updates - const updateMarkerPosition = (lat: number, lng: number) => { - if (markerRef && markerRef.current) { - markerRef.current.setNativeProps({ - coordinate: {latitude: lat, longitude: lng}, - }); + if (Platform.OS === 'android') { + if (this.marker) { + this.marker._component.animateMarkerToCoordinate(newCoordinate, 500); + } + } else { + // `useNativeDriver` defaults to false if not passed explicitly + coordinate.timing({...newCoordinate, useNativeDriver: true}).start(); } - }; + } - // Use useDerivedValue to react to changes in latitude and longitude - useDerivedValue(() => { - const lat = latitude.value; - const lng = longitude.value; - // Use runOnJS to call updateMarkerPosition from the UI thread - // runOnJS requires functions to be called with their arguments - runOnJS(updateMarkerPosition)(lat, lng); - }, [latitude, longitude]); - - return ( - - - + - - - - Animate - + latitudeDelta: LATITUDE_DELTA, + longitudeDelta: LONGITUDE_DELTA, + }}> + { + this.marker = marker; + }} + coordinate={this.state.coordinate} + /> + + + this.animate()} + style={[styles.bubble, styles.button]}> + Animate + + - - ); -}; + ); + } +} const styles = StyleSheet.create({ container: { @@ -100,6 +95,10 @@ const styles = StyleSheet.create({ paddingVertical: 12, borderRadius: 20, }, + latlng: { + width: 200, + alignItems: 'stretch', + }, button: { width: 80, paddingHorizontal: 12, diff --git a/example/yarn.lock b/example/yarn.lock index e9695b82a8..6e89fcccc5 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -767,13 +767,6 @@ "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-transform-object-assign@^7.16.7": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.24.1.tgz#46a70169e56970aafd13a6ae677d5b497fc227e7" - integrity sha512-I1kctor9iKtupb7jv7FyjApHCuKLBKCblVAeHVK9PB6FW7GI0ac6RtobC3MwwJy8CZ1JxuhQmnbrsqI5G8hAIg== - dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/plugin-transform-object-rest-spread@^7.24.1": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz#5a3ce73caf0e7871a02e1c31e8b473093af241ff" @@ -1081,7 +1074,7 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.7": +"@babel/preset-typescript@^7.13.0": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz#89bdf13a3149a17b3b2a2c9c62547f06db8845ec" integrity sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ== @@ -4546,16 +4539,6 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-native-reanimated@3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.7.2.tgz#688a0002d129a8ddcef919093c45c67de18923f5" - integrity sha512-3KpTmYEcmHhkZeTqgWtioqnljpd4TLxKHClvarYsA3UXU2Tv+O1gqlRhVhfHBZuiDngVu436gWkde9+/VQVMFQ== - dependencies: - "@babel/plugin-transform-object-assign" "^7.16.7" - "@babel/preset-typescript" "^7.16.7" - convert-source-map "^2.0.0" - invariant "^2.2.4" - react-native@0.73.6: version "0.73.6" resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.73.6.tgz#ed4c675e205a34bd62c4ce8b9bd1ca5c85126d5b"