From 9de18135890624345a2fdc37e9440d8f7bc3c369 Mon Sep 17 00:00:00 2001 From: kacperkapusciak Date: Thu, 28 Jul 2022 14:49:35 +0200 Subject: [PATCH] fix: remove explicit folly version --- FabricExample/ios/Podfile.lock | 16 ++++++------- .../patches/react-native-screens+3.13.1.patch | 23 ++++++++++++++++++- RNGestureHandler.podspec | 5 +--- example/ios/Podfile.lock | 4 ++-- 4 files changed, 33 insertions(+), 15 deletions(-) diff --git a/FabricExample/ios/Podfile.lock b/FabricExample/ios/Podfile.lock index 2f4e1911cc..e3431bf742 100644 --- a/FabricExample/ios/Podfile.lock +++ b/FabricExample/ios/Podfile.lock @@ -721,7 +721,7 @@ PODS: - React-logger (= 0.69.0) - React-perflogger (= 0.69.0) - RNGestureHandler (2.5.0): - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly - RCTRequired - RCTTypeSafety - React @@ -729,7 +729,7 @@ PODS: - React-RCTFabric - ReactCommon/turbomodule/core - RNScreens (3.13.1): - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly - RCTRequired - RCTTypeSafety - React @@ -738,7 +738,7 @@ PODS: - ReactCommon/turbomodule/core - RNScreens/common (= 3.13.1) - RNScreens/common (3.13.1): - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly - RCTRequired - RCTTypeSafety - React @@ -925,7 +925,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 + DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 FBLazyVector: f98dec9f199b7b51db586fe0140f509fabd5cc54 FBReactNativeSpec: a18ce612cc55071c8b5fc186125e60d993e749bc Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 @@ -938,11 +938,11 @@ SPEC CHECKSUMS: Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a + glog: 476ee3e89abb49e07f822b48323c51c57124b572 hermes-engine: 03851318b18b534b671ea435fad2202154135c72 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 + RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685 RCTRequired: eff60a46da0f496a6c76c8f60108c20626860d27 RCTTypeSafety: 8cc8a45d0e2f93f1b42b5b2bbf23c4143f19935a React: 8a8fc19196a41141ecb5bde33c97091cdc25ccd8 @@ -974,8 +974,8 @@ SPEC CHECKSUMS: React-rncore: 0a5131510415ca520866410f3504832de3d6f753 React-runtimeexecutor: 7ad268dee53d001697e13264c6bc8e95a902352e ReactCommon: 74a3b8ee497c6d50ce86ef57e15c4c5bf654b83d - RNGestureHandler: 28c0a447ceb87b96c4045c2f786f67958837f320 - RNScreens: 592316e0744de3b640e90c335a45aad13088381a + RNGestureHandler: c2c12e610e4d94ea917bbd31801974edcee4dd94 + RNScreens: 71cee3b50648a986acd9d0e4ac9c8f20f1aedbf7 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: 4935173923cabaa830e195be3e8e4cac045a8f90 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/FabricExample/patches/react-native-screens+3.13.1.patch b/FabricExample/patches/react-native-screens+3.13.1.patch index 0fb9d0cdaa..04a7fc6241 100644 --- a/FabricExample/patches/react-native-screens+3.13.1.patch +++ b/FabricExample/patches/react-native-screens+3.13.1.patch @@ -1,3 +1,24 @@ +diff --git a/node_modules/react-native-screens/RNScreens.podspec b/node_modules/react-native-screens/RNScreens.podspec +index c722d95..7d9dce7 100644 +--- a/node_modules/react-native-screens/RNScreens.podspec ++++ b/node_modules/react-native-screens/RNScreens.podspec +@@ -6,7 +6,6 @@ fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] + + # folly_version must match the version used in React Native + # See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec +-folly_version = '2021.06.28.00-v2' + folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' + + Pod::Spec.new do |s| +@@ -36,7 +35,7 @@ Pod::Spec.new do |s| + s.dependency "React" + s.dependency "React-RCTFabric" + s.dependency "React-Codegen" +- s.dependency "RCT-Folly", folly_version ++ s.dependency "RCT-Folly" + s.dependency "RCTRequired" + s.dependency "RCTTypeSafety" + s.dependency "ReactCommon/turbomodule/core" diff --git a/node_modules/react-native-screens/android/build.gradle b/node_modules/react-native-screens/android/build.gradle index 7ceb834..13544e8 100644 --- a/node_modules/react-native-screens/android/build.gradle @@ -78,4 +99,4 @@ index 5a0e37d..7a5ca3b 100644 +- (void)mountingTransactionWillMount:(facebook::react::MountingTransaction const &)transaction { [self takeSnapshot]; - } \ No newline at end of file + } diff --git a/RNGestureHandler.podspec b/RNGestureHandler.podspec index 100d320b60..7269c08b56 100644 --- a/RNGestureHandler.podspec +++ b/RNGestureHandler.podspec @@ -17,9 +17,6 @@ Pod::Spec.new do |s| s.requires_arc = true if fabric_enabled - # folly_version must match the version used in React Native - # See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec - folly_version = '2021.06.28.00-v2' folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' s.pod_target_xcconfig = { @@ -32,7 +29,7 @@ Pod::Spec.new do |s| s.dependency "React" s.dependency "React-RCTFabric" # This is for fabric component s.dependency "React-Codegen" - s.dependency "RCT-Folly", folly_version + s.dependency "RCT-Folly" s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "ReactCommon/turbomodule/core" diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 64e18b3b60..cb624ab94b 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -568,10 +568,10 @@ SPEC CHECKSUMS: Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85 + glog: 476ee3e89abb49e07f822b48323c51c57124b572 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685 + RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 RCTRequired: bab4a7c3d7eb9553b13773ee190f279712efd1fc RCTTypeSafety: efbeb6e450ff6cef8e19c2cb5314c6d8bfeeef77 React: 28e4d45839b7d0fd9512af899e0379a17a5172ec