Skip to content

Commit 915b6e4

Browse files
fix: remove explicit folly version (#2148)
As a version of folly can change between versions of React-native we need to remove an explicit version of `folly_version` from our libraries to let RN infer the correct version. Change based on AppAndFlow/react-native-safe-area-context@eb111ff
1 parent 3ff7674 commit 915b6e4

File tree

4 files changed

+33
-15
lines changed

4 files changed

+33
-15
lines changed

FabricExample/ios/Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -721,15 +721,15 @@ PODS:
721721
- React-logger (= 0.69.0)
722722
- React-perflogger (= 0.69.0)
723723
- RNGestureHandler (2.5.0):
724-
- RCT-Folly (= 2021.06.28.00-v2)
724+
- RCT-Folly
725725
- RCTRequired
726726
- RCTTypeSafety
727727
- React
728728
- React-Codegen
729729
- React-RCTFabric
730730
- ReactCommon/turbomodule/core
731731
- RNScreens (3.13.1):
732-
- RCT-Folly (= 2021.06.28.00-v2)
732+
- RCT-Folly
733733
- RCTRequired
734734
- RCTTypeSafety
735735
- React
@@ -738,7 +738,7 @@ PODS:
738738
- ReactCommon/turbomodule/core
739739
- RNScreens/common (= 3.13.1)
740740
- RNScreens/common (3.13.1):
741-
- RCT-Folly (= 2021.06.28.00-v2)
741+
- RCT-Folly
742742
- RCTRequired
743743
- RCTTypeSafety
744744
- React
@@ -925,7 +925,7 @@ EXTERNAL SOURCES:
925925
SPEC CHECKSUMS:
926926
boost: a7c83b31436843459a1961bfd74b96033dc77234
927927
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
928-
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
928+
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
929929
FBLazyVector: f98dec9f199b7b51db586fe0140f509fabd5cc54
930930
FBReactNativeSpec: a18ce612cc55071c8b5fc186125e60d993e749bc
931931
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
@@ -938,11 +938,11 @@ SPEC CHECKSUMS:
938938
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
939939
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
940940
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
941-
glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
941+
glog: 476ee3e89abb49e07f822b48323c51c57124b572
942942
hermes-engine: 03851318b18b534b671ea435fad2202154135c72
943943
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
944944
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
945-
RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
945+
RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
946946
RCTRequired: eff60a46da0f496a6c76c8f60108c20626860d27
947947
RCTTypeSafety: 8cc8a45d0e2f93f1b42b5b2bbf23c4143f19935a
948948
React: 8a8fc19196a41141ecb5bde33c97091cdc25ccd8
@@ -974,8 +974,8 @@ SPEC CHECKSUMS:
974974
React-rncore: 0a5131510415ca520866410f3504832de3d6f753
975975
React-runtimeexecutor: 7ad268dee53d001697e13264c6bc8e95a902352e
976976
ReactCommon: 74a3b8ee497c6d50ce86ef57e15c4c5bf654b83d
977-
RNGestureHandler: 28c0a447ceb87b96c4045c2f786f67958837f320
978-
RNScreens: 592316e0744de3b640e90c335a45aad13088381a
977+
RNGestureHandler: c2c12e610e4d94ea917bbd31801974edcee4dd94
978+
RNScreens: 71cee3b50648a986acd9d0e4ac9c8f20f1aedbf7
979979
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
980980
Yoga: 4935173923cabaa830e195be3e8e4cac045a8f90
981981
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

FabricExample/patches/react-native-screens+3.13.1.patch

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
diff --git a/node_modules/react-native-screens/RNScreens.podspec b/node_modules/react-native-screens/RNScreens.podspec
2+
index c722d95..7d9dce7 100644
3+
--- a/node_modules/react-native-screens/RNScreens.podspec
4+
+++ b/node_modules/react-native-screens/RNScreens.podspec
5+
@@ -6,7 +6,6 @@ fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED']
6+
7+
# folly_version must match the version used in React Native
8+
# See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec
9+
-folly_version = '2021.06.28.00-v2'
10+
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
11+
12+
Pod::Spec.new do |s|
13+
@@ -36,7 +35,7 @@ Pod::Spec.new do |s|
14+
s.dependency "React"
15+
s.dependency "React-RCTFabric"
16+
s.dependency "React-Codegen"
17+
- s.dependency "RCT-Folly", folly_version
18+
+ s.dependency "RCT-Folly"
19+
s.dependency "RCTRequired"
20+
s.dependency "RCTTypeSafety"
21+
s.dependency "ReactCommon/turbomodule/core"
122
diff --git a/node_modules/react-native-screens/android/build.gradle b/node_modules/react-native-screens/android/build.gradle
223
index 7ceb834..13544e8 100644
324
--- a/node_modules/react-native-screens/android/build.gradle
@@ -78,4 +99,4 @@ index 5a0e37d..7a5ca3b 100644
7899
+- (void)mountingTransactionWillMount:(facebook::react::MountingTransaction const &)transaction
79100
{
80101
[self takeSnapshot];
81-
}
102+
}

RNGestureHandler.podspec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ Pod::Spec.new do |s|
1717
s.requires_arc = true
1818

1919
if fabric_enabled
20-
# folly_version must match the version used in React Native
21-
# See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec
22-
folly_version = '2021.06.28.00-v2'
2320
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
2421

2522
s.pod_target_xcconfig = {
@@ -32,7 +29,7 @@ Pod::Spec.new do |s|
3229
s.dependency "React"
3330
s.dependency "React-RCTFabric" # This is for fabric component
3431
s.dependency "React-Codegen"
35-
s.dependency "RCT-Folly", folly_version
32+
s.dependency "RCT-Folly"
3633
s.dependency "RCTRequired"
3734
s.dependency "RCTTypeSafety"
3835
s.dependency "ReactCommon/turbomodule/core"

example/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,10 +568,10 @@ SPEC CHECKSUMS:
568568
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
569569
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
570570
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
571-
glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
571+
glog: 476ee3e89abb49e07f822b48323c51c57124b572
572572
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
573573
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
574-
RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
574+
RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
575575
RCTRequired: bab4a7c3d7eb9553b13773ee190f279712efd1fc
576576
RCTTypeSafety: efbeb6e450ff6cef8e19c2cb5314c6d8bfeeef77
577577
React: 28e4d45839b7d0fd9512af899e0379a17a5172ec

0 commit comments

Comments
 (0)