Skip to content

Commit 2a5265d

Browse files
mikehardyfacebook-github-bot
authored andcommitted
fix(ios, flipper): update flipper sub-pods to support macCatalyst (#33406)
Summary: Flipper-DoubleConversion and Flipper-Glog iOS pods received a build optimization a few versions back that pre-compiled the pods and references the xcframework slices Unfortunately, the pre-compile did not include macCatalyst slices, so this disabled support for flipper on macOS for react-native >0.65 lblasa has re-compiled the pods with the macCatalyst slices added See facebook/flipper#3117 ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see: https://github.com/facebook/react-native/wiki/Changelog --> [iOS] [Fixed] - update Flipper pods to support re-enable macCatalyst Pull Request resolved: #33406 Test Plan: - [ ] The Flipper repo has a react-native test that appeared to work with these versions, CI should work here - [ ] Prove there is no regression, a flipper-enabled build test should work for simulator iOS target on arm64 - [ ] Prove there is no regression, a flipper-enabled build test should work for simulator iOS target on x86_64 mac - [ ] Prove there is no regression, a flipper-enabled build test should work for real device iOS target - [ ] To prove the issue is resolved, a build should be attempted for a macCatalyst target, and it should work. Reviewed By: cortinico Differential Revision: D34789654 Pulled By: lblasa fbshipit-source-id: 466803dd07b5820220512b7d7d760b94b8aa65f7
1 parent a7a781f commit 2a5265d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

packages/rn-tester/Podfile.lock

+11-11
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PODS:
1414
- Flipper-Folly (~> 2.6)
1515
- Flipper-RSocket (~> 1.4)
1616
- Flipper-Boost-iOSX (1.76.0.1.11)
17-
- Flipper-DoubleConversion (3.1.7)
17+
- Flipper-DoubleConversion (3.2.0)
1818
- Flipper-Fmt (7.1.7)
1919
- Flipper-Folly (2.6.10):
2020
- Flipper-Boost-iOSX
@@ -23,7 +23,7 @@ PODS:
2323
- Flipper-Glog
2424
- libevent (~> 2.1.12)
2525
- OpenSSL-Universal (= 1.1.1100)
26-
- Flipper-Glog (0.3.9)
26+
- Flipper-Glog (0.5.0.3)
2727
- Flipper-PeerTalk (0.0.4)
2828
- Flipper-RSocket (1.4.3):
2929
- Flipper-Folly (~> 2.6)
@@ -710,7 +710,7 @@ PODS:
710710
- ReactCommon/turbomodule/core (= 1000.0.0)
711711
- ScreenshotManager (0.0.1):
712712
- RCT-Folly (= 2021.06.28.00-v2)
713-
- React
713+
- React-Core
714714
- SocketRocket (0.6.0)
715715
- Yoga (1.14.0)
716716
- YogaKit (1.18.1):
@@ -723,10 +723,10 @@ DEPENDENCIES:
723723
- FBReactNativeSpec (from `../../React/FBReactNativeSpec`)
724724
- Flipper (= 0.125.0)
725725
- Flipper-Boost-iOSX (= 1.76.0.1.11)
726-
- Flipper-DoubleConversion (= 3.1.7)
726+
- Flipper-DoubleConversion (= 3.2.0)
727727
- Flipper-Fmt (= 7.1.7)
728728
- Flipper-Folly (= 2.6.10)
729-
- Flipper-Glog (= 0.3.9)
729+
- Flipper-Glog (= 0.5.0.3)
730730
- Flipper-PeerTalk (= 0.0.4)
731731
- Flipper-RSocket (= 1.4.3)
732732
- FlipperKit (= 0.125.0)
@@ -884,13 +884,13 @@ SPEC CHECKSUMS:
884884
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
885885
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
886886
FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949
887-
FBReactNativeSpec: 04dbf2a5d787706cace2f2af8ff3790333b761cd
887+
FBReactNativeSpec: 4343c04fd79251fa1e5f2243b536df24009834f6
888888
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
889889
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
890-
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
890+
Flipper-DoubleConversion: 3d3d04a078d4f3a1b6c6916587f159dc11f232c4
891891
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
892892
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
893-
Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4
893+
Flipper-Glog: 7761f5362d23ead28c19afc2dd1d819f00e40df9
894894
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
895895
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
896896
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
@@ -926,12 +926,12 @@ SPEC CHECKSUMS:
926926
React-RCTTest: 7cbcd615b1e74ad59c9ad4257e6c323482114173
927927
React-RCTText: e9146b2c0550a83d1335bfe2553760070a2d75c7
928928
React-RCTVibration: 9a73a3550a0ee184530341f91f9b85ad9cf3465a
929-
React-rncore: 69bf49af24eafcd61f1e352c0cbff5cf17e70ed4
929+
React-rncore: b6e9b49eb1c7c045b98c77b1f94932e3c0be7cec
930930
React-runtimeexecutor: 4b0c6eb341c7d3ceb5e2385cb0fdb9bf701024f3
931931
ReactCommon: 9607f2246289d573adcbd144c02c19ae5246d6a5
932-
ScreenshotManager: 2e9d0bca1461f67405d21ca06a609cb844c3fb3c
932+
ScreenshotManager: 8a08e488cb533b83ebe069ad6109d9c1df9cea79
933933
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
934-
Yoga: c0d06f5380d34e939f55420669a60fe08b79bd75
934+
Yoga: faebdb8710c7e742c6ab99e14ed4270b8da27f1f
935935
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
936936

937937
PODFILE CHECKSUM: 064c91fbb8ac895e453a791ebaaae5cfe9c8557d

scripts/react_native_pods.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ def get_default_flags()
137137
def use_flipper!(versions = {}, configurations: ['Debug'])
138138
versions['Flipper'] ||= '0.125.0'
139139
versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11'
140-
versions['Flipper-DoubleConversion'] ||= '3.1.7'
140+
versions['Flipper-DoubleConversion'] ||= '3.2.0'
141141
versions['Flipper-Fmt'] ||= '7.1.7'
142142
versions['Flipper-Folly'] ||= '2.6.10'
143-
versions['Flipper-Glog'] ||= '0.3.9'
143+
versions['Flipper-Glog'] ||= '0.5.0.3'
144144
versions['Flipper-PeerTalk'] ||= '0.0.4'
145145
versions['Flipper-RSocket'] ||= '1.4.3'
146146
versions['OpenSSL-Universal'] ||= '1.1.1100'

0 commit comments

Comments
 (0)