From 4163386aee7e871a67496ef9a7aa92d6ba8fab76 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Fri, 11 Mar 2022 02:47:27 -0800 Subject: [PATCH] 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 https://github.com/facebook/flipper/issues/3117 [iOS] [Fixed] - update Flipper pods to support re-enable macCatalyst Pull Request resolved: https://github.com/facebook/react-native/pull/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 --- packages/rn-tester/Podfile.lock | 84 ++++++++++++++++----------------- scripts/react_native_pods.rb | 4 +- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 8aee657c5f0dc9..8dac392784aedf 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -14,7 +14,7 @@ PODS: - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) - Flipper-Boost-iOSX (1.76.0.1.11) - - Flipper-DoubleConversion (3.1.7) + - Flipper-DoubleConversion (3.2.0) - Flipper-Fmt (7.1.7) - Flipper-Folly (2.6.10): - Flipper-Boost-iOSX @@ -23,7 +23,7 @@ PODS: - Flipper-Glog - libevent (~> 2.1.12) - OpenSSL-Universal (= 1.1.1100) - - Flipper-Glog (0.3.9) + - Flipper-Glog (0.5.0.3) - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.4.3): - Flipper-Folly (~> 2.6) @@ -710,7 +710,7 @@ PODS: - ReactCommon/turbomodule/core (= 0.68.0-rc.2) - ScreenshotManager (0.0.1): - RCT-Folly (= 2021.06.28.00-v2) - - React + - React-Core - SocketRocket (0.6.0) - Yoga (1.14.0) - YogaKit (1.18.1): @@ -723,10 +723,10 @@ DEPENDENCIES: - FBReactNativeSpec (from `../../React/FBReactNativeSpec`) - Flipper (= 0.125.0) - Flipper-Boost-iOSX (= 1.76.0.1.11) - - Flipper-DoubleConversion (= 3.1.7) + - Flipper-DoubleConversion (= 3.2.0) - Flipper-Fmt (= 7.1.7) - Flipper-Folly (= 2.6.10) - - Flipper-Glog (= 0.3.9) + - Flipper-Glog (= 0.5.0.3) - Flipper-PeerTalk (= 0.0.4) - Flipper-RSocket (= 1.4.3) - FlipperKit (= 0.125.0) @@ -883,14 +883,14 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: 07eb8bb0d56ecb0c16f771d81f0f25008bc403b5 - FBReactNativeSpec: fb31698a9d08f8a2d406faffdc56d9aca966d874 + FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949 + FBReactNativeSpec: 4343c04fd79251fa1e5f2243b536df24009834f6 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c + Flipper-DoubleConversion: 3d3d04a078d4f3a1b6c6916587f159dc11f232c4 Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 - Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4 + Flipper-Glog: 7761f5362d23ead28c19afc2dd1d819f00e40df9 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 @@ -898,40 +898,40 @@ SPEC CHECKSUMS: glog: 476ee3e89abb49e07f822b48323c51c57124b572 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685 - RCTRequired: 180eaa134050e3315986c2ae145f3674be78ae3e - RCTTypeSafety: 91d830366397fae0974496104cedce043279045d - React: f6ee8a53d6212d8939ce92a537cb4b179dc01109 - React-callinvoker: 62fc4e32f979e20a321d60e37c792b70c210244b - React-Codegen: ead54815cf8d8ce59087a6a14ca502e9824377a1 - React-Core: d894f74339f2c56bf2d4e87c20f135b34803d676 - React-CoreModules: 89cdf26ecff5d019f5e73c2cb750abc9f2657c87 - React-cxxreact: f7bad9461a1570a1871b9f2b3276ccd989253562 - React-Fabric: bd860a32a1441b16954b4a42604493b389ec0e0f - React-graphics: 1f55c02e913e20f03124bb0e4e70e2423d54f6ae - React-jsi: ef80f544ee1c0b9d7d29b33963520fafd9992fa9 - React-jsiexecutor: 352a2d26dd981cf2586e144196ae0972fd7ee0d0 - React-jsinspector: f5ae77343a320a7d644b424ab4808c7827f3a1b3 - React-logger: 2fa2f7404a8f41ed2c787e1bb84d13343f2997cf - React-perflogger: 3bf9ae62c5bff7308a3886ab4e51f4420bfa16c0 - React-RCTActionSheet: d056d06abe9e0a7c59a6dbd6103a323417bdc901 - React-RCTAnimation: 34339473f0ebaf7b183a2344a1fe6a18da6162a8 - React-RCTBlob: 08c8d788b269ff3ea1df236a33b91d1cfaed0f0d - React-RCTFabric: 1b30ab3573c3a66bae9a68b3102884b6a3cf99bc - React-RCTImage: a4d41a79b2a1cbfdbf779907f803f57ebbb85af1 - React-RCTLinking: a98387924d98d68e686ebaa539bf0523ebb3d61c - React-RCTNetwork: dc08d04b3f49c42fcc6d56c869fd98542945d48a - React-RCTPushNotification: 2c3b882fae1e0a23e8bbb03598c78ae8ce1ce55e - React-RCTSettings: 45a6f0a9a45eb0f1f0272c359af8ce6957b6eb10 - React-RCTTest: 899778113e1b2fd07c1e6153332231f11087cf19 - React-RCTText: b88155b89ba6fb2d4e21d17dce575d0fc206a7b1 - React-RCTVibration: 25ef5d6f6141ea389d41d93d5a2ca1b4771920b4 - React-rncore: 4c320494daa010d415b96656ce28df00877085c4 - React-runtimeexecutor: 37e5fa0b81067a8e487391e2816bae8813b226a5 - ReactCommon: 4c7431a20d472996669b2230f34df0115bf5dc8d - ScreenshotManager: 6e1ed269e1abe35b082a3132130a82c0ca75c941 + RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 + RCTRequired: af2d6080a4b9ba0885b28ca78879a92066c71cab + RCTTypeSafety: 2d6c5149fd3b8f2ba89987b47169423efb740300 + React: f64c9f6db5428717922a3292ba6a448615a2e143 + React-callinvoker: c5d61e29df57793f0dc10ec2bc01c846f863e51f + React-Codegen: c4ae835565487e494740b756ce953d8f635a76df + React-Core: 30784d0eacbd709a3a6a5ae7c02c928634a6247e + React-CoreModules: e784fdac1d0293963fc06646aa76cfdcd906a754 + React-cxxreact: cfc1663dae1ea52b465bbf021ef7b1527c5dc80c + React-Fabric: 30b8fa96a0c56d1c11348f77607464eb87bb3f9f + React-graphics: 9a84942b49ea1375ce83844041fa2ba766cfe0b9 + React-jsi: c1c0108d86e1378aabf7c9146ed7d12d87c7df85 + React-jsiexecutor: d08ec14edc8f2e19af51550cd1505332eae35c7b + React-jsinspector: 7d223826b0e7a61b3540c21b9eca2603b1d4e823 + React-logger: 2009c0280c286a76200d6b7c5fe242fad51ddd7a + React-perflogger: fe66bd6d8b17ebcfdf0159bf41fe28d8035ac20c + React-RCTActionSheet: 3131a0b9280aa0e51bdf54b3d79aecd8503db62c + React-RCTAnimation: 218e2557f9803c1d8b4fd814b6c54b223ee18cda + React-RCTBlob: f94c621fa9851a5f81da471016ce5d91d29b2c7f + React-RCTFabric: 134127990b95158033ff22db25f5474d4aeecc96 + React-RCTImage: 996407b090e9fa8bb2213b6887676b1541052cb5 + React-RCTLinking: 6fcb5735f35935e0e53dc45e97f77234d7920232 + React-RCTNetwork: 2d51ae6d31c26bbcaab9abd56e523f8010cc57ae + React-RCTPushNotification: c5dfa4ab4da2b5312223334a55b30527218197d4 + React-RCTSettings: 9f897f32b7c4d0bc9a2718b7cb7d4f193889f5e3 + React-RCTTest: 7cbcd615b1e74ad59c9ad4257e6c323482114173 + React-RCTText: e9146b2c0550a83d1335bfe2553760070a2d75c7 + React-RCTVibration: 9a73a3550a0ee184530341f91f9b85ad9cf3465a + React-rncore: b6e9b49eb1c7c045b98c77b1f94932e3c0be7cec + React-runtimeexecutor: 4b0c6eb341c7d3ceb5e2385cb0fdb9bf701024f3 + ReactCommon: 9607f2246289d573adcbd144c02c19ae5246d6a5 + ScreenshotManager: 8a08e488cb533b83ebe069ad6109d9c1df9cea79 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: d7b12009fb66b91a161cddf00c349d42a0015de2 + Yoga: faebdb8710c7e742c6ab99e14ed4270b8da27f1f YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 064c91fbb8ac895e453a791ebaaae5cfe9c8557d diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb index e9a10966a1985d..37ec993581c4f9 100644 --- a/scripts/react_native_pods.rb +++ b/scripts/react_native_pods.rb @@ -131,10 +131,10 @@ def get_default_flags() def use_flipper!(versions = {}, configurations: ['Debug']) versions['Flipper'] ||= '0.125.0' versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11' - versions['Flipper-DoubleConversion'] ||= '3.1.7' + versions['Flipper-DoubleConversion'] ||= '3.2.0' versions['Flipper-Fmt'] ||= '7.1.7' versions['Flipper-Folly'] ||= '2.6.10' - versions['Flipper-Glog'] ||= '0.3.9' + versions['Flipper-Glog'] ||= '0.5.0.3' versions['Flipper-PeerTalk'] ||= '0.0.4' versions['Flipper-RSocket'] ||= '1.4.3' versions['OpenSSL-Universal'] ||= '1.1.1100'