Skip to content

Commit e8262b0

Browse files
fix: remove explicit folly version (#1549)
1 parent c6488c4 commit e8262b0

File tree

5 files changed

+26
-29
lines changed

5 files changed

+26
-29
lines changed

Example/ios/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ PODS:
355355
- React-Core
356356
- RNReanimated (1.13.2):
357357
- React-Core
358-
- RNScreens (3.12.0):
358+
- RNScreens (3.15.0):
359359
- React-Core
360360
- React-RCTImage
361361
- RNVectorIcons (8.0.0):
@@ -575,11 +575,11 @@ SPEC CHECKSUMS:
575575
RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
576576
RNGestureHandler: 5e58135436aacc1c5d29b75547d3d2b9430d052c
577577
RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad
578-
RNScreens: 2559f98b0835103cbef3b26ba77fa61d4bb37ae7
578+
RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
579579
RNVectorIcons: f67a1abce2ec73e62fe4606e8110e95a832bc859
580580
Yoga: c11abbf5809216c91fcd62f5571078b83d9b6720
581581
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
582582

583583
PODFILE CHECKSUM: 459089ec5d136d365c5a2280990b9d638cbda105
584584

585-
COCOAPODS: 1.11.2
585+
COCOAPODS: 1.11.3

FabricExample/ios/Podfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ PODS:
7373
- FlipperKit/FlipperKitNetworkPlugin
7474
- fmt (6.2.1)
7575
- glog (0.3.5)
76-
- hermes-engine (0.69.0-rc.6)
76+
- hermes-engine (0.69.1)
7777
- libevent (2.1.12)
7878
- OpenSSL-Universal (1.1.1100)
7979
- RCT-Folly (2021.06.28.00-v2):
@@ -720,17 +720,17 @@ PODS:
720720
- React-jsi (= 0.69.1)
721721
- React-logger (= 0.69.1)
722722
- React-perflogger (= 0.69.1)
723-
- RNScreens (3.14.0):
724-
- RCT-Folly (= 2021.06.28.00-v2)
723+
- RNScreens (3.15.0):
724+
- RCT-Folly
725725
- RCTRequired
726726
- RCTTypeSafety
727727
- React
728728
- React-Codegen
729729
- React-RCTFabric
730730
- ReactCommon/turbomodule/core
731-
- RNScreens/common (= 3.14.0)
732-
- RNScreens/common (3.14.0):
733-
- RCT-Folly (= 2021.06.28.00-v2)
731+
- RNScreens/common (= 3.15.0)
732+
- RNScreens/common (3.15.0):
733+
- RCT-Folly
734734
- RCTRequired
735735
- RCTTypeSafety
736736
- React
@@ -914,7 +914,7 @@ EXTERNAL SOURCES:
914914
SPEC CHECKSUMS:
915915
boost: a7c83b31436843459a1961bfd74b96033dc77234
916916
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
917-
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
917+
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
918918
FBLazyVector: 068141206af867f72854753423d0117c4bf53419
919919
FBReactNativeSpec: 035cd010765c7e1349c39649579934df6ef42fb2
920920
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
@@ -927,11 +927,11 @@ SPEC CHECKSUMS:
927927
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
928928
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
929929
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
930-
glog: 476ee3e89abb49e07f822b48323c51c57124b572
931-
hermes-engine: 2e82f88c31292b562cbc210540be4258dbf44b5f
930+
glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
931+
hermes-engine: ece2bfa9bdb7f77f393cb2b41edf638eb086ec1a
932932
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
933933
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
934-
RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
934+
RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a
935935
RCTRequired: ae07282b2ec9c90d7eb98251603bc3f82403d239
936936
RCTTypeSafety: a04dc1339af2e1da759ccd093bf11c310dce1ef6
937937
React: dbd201f781b180eab148aa961683943c72f67dcf
@@ -963,7 +963,7 @@ SPEC CHECKSUMS:
963963
React-rncore: cb0378f68684034519651b7472af51c1a0321f41
964964
React-runtimeexecutor: 27f468c5576eaf05ffb7a907528e44c75a3fcbae
965965
ReactCommon: e30ec17dfb1d4c4f3419eac254350d6abca6d5a2
966-
RNScreens: 38985c8ae6321eb650fa035429a574e010ccfa7f
966+
RNScreens: 865ade69cfb9cc9d3bb3b42131dfa83855b5e7a0
967967
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
968968
Yoga: 7ab6e3ee4ce47d7b789d1cb520163833e515f452
969969
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

FabricTestExample/ios/Podfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ PODS:
7373
- FlipperKit/FlipperKitNetworkPlugin
7474
- fmt (6.2.1)
7575
- glog (0.3.5)
76-
- hermes-engine (0.69.0)
76+
- hermes-engine (0.69.1)
7777
- libevent (2.1.12)
7878
- OpenSSL-Universal (1.1.1100)
7979
- RCT-Folly (2021.06.28.00-v2):
@@ -757,17 +757,17 @@ PODS:
757757
- React-RCTText
758758
- ReactCommon/turbomodule/core
759759
- Yoga
760-
- RNScreens (3.14.1):
761-
- RCT-Folly (= 2021.06.28.00-v2)
760+
- RNScreens (3.15.0):
761+
- RCT-Folly
762762
- RCTRequired
763763
- RCTTypeSafety
764764
- React
765765
- React-Codegen
766766
- React-RCTFabric
767767
- ReactCommon/turbomodule/core
768-
- RNScreens/common (= 3.14.1)
769-
- RNScreens/common (3.14.1):
770-
- RCT-Folly (= 2021.06.28.00-v2)
768+
- RNScreens/common (= 3.15.0)
769+
- RNScreens/common (3.15.0):
770+
- RCT-Folly
771771
- RCTRequired
772772
- RCTTypeSafety
773773
- React
@@ -971,10 +971,10 @@ SPEC CHECKSUMS:
971971
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
972972
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
973973
glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
974-
hermes-engine: 03851318b18b534b671ea435fad2202154135c72
974+
hermes-engine: ece2bfa9bdb7f77f393cb2b41edf638eb086ec1a
975975
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
976976
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
977-
RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
977+
RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a
978978
RCTRequired: ae07282b2ec9c90d7eb98251603bc3f82403d239
979979
RCTTypeSafety: a04dc1339af2e1da759ccd093bf11c310dce1ef6
980980
React: dbd201f781b180eab148aa961683943c72f67dcf
@@ -1008,7 +1008,7 @@ SPEC CHECKSUMS:
10081008
ReactCommon: e30ec17dfb1d4c4f3419eac254350d6abca6d5a2
10091009
RNGestureHandler: 28c0a447ceb87b96c4045c2f786f67958837f320
10101010
RNReanimated: 94d4e56073c2989550dba1ce29d41a5fe9d74e7f
1011-
RNScreens: 53cf515660c20820bf0ecc9795718c3484d6321f
1011+
RNScreens: 865ade69cfb9cc9d3bb3b42131dfa83855b5e7a0
10121012
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
10131013
Yoga: 7ab6e3ee4ce47d7b789d1cb520163833e515f452
10141014
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

RNScreens.podspec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
44

55
fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
66

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'
107
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
118

129
Pod::Spec.new do |s|
@@ -36,7 +33,7 @@ Pod::Spec.new do |s|
3633
s.dependency "React"
3734
s.dependency "React-RCTFabric"
3835
s.dependency "React-Codegen"
39-
s.dependency "RCT-Folly", folly_version
36+
s.dependency "RCT-Folly"
4037
s.dependency "RCTRequired"
4138
s.dependency "RCTTypeSafety"
4239
s.dependency "ReactCommon/turbomodule/core"

TestsExample/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ PODS:
385385
- React-RCTText
386386
- ReactCommon/turbomodule/core
387387
- Yoga
388-
- RNScreens (3.14.0):
388+
- RNScreens (3.15.0):
389389
- React-Core
390390
- React-RCTImage
391391
- SocketRocket (0.6.0)
@@ -595,7 +595,7 @@ SPEC CHECKSUMS:
595595
ReactCommon: 74a3b8ee497c6d50ce86ef57e15c4c5bf654b83d
596596
RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
597597
RNReanimated: 2cf7451318bb9cc430abeec8d67693f9cf4e039c
598-
RNScreens: 4830eb40e0793b38849965cd27f4f3a7d7bc65c1
598+
RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
599599
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
600600
Yoga: 4935173923cabaa830e195be3e8e4cac045a8f90
601601
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

0 commit comments

Comments
 (0)