Skip to content

Commit 82b2cfa

Browse files
committed
ios/Podfile: Use new, acceptable Flipper version defaults from RN v0.64.
These defaults are set in https://github.com/facebook/react-native/blob/v0.64.2/scripts/react_native_pods.rb: versions['Flipper'] ||= '~> 0.75.1' versions['Flipper-Folly'] ||= '~> 2.5.3' versions['Flipper-RSocket'] ||= '~> 1.3' We started pinning to some specific versions in 912cb9e, following published advice from RN in facebook/react-native#31480 for fixing a build issue with Xcode 12.5. Checking that advice again, its entry suggests that we don't have to do anything as long as we're at RN v0.64.1 or higher. Which makes sense, seeing those defaults.
1 parent f5d7a81 commit 82b2cfa

File tree

2 files changed

+18
-22
lines changed

2 files changed

+18
-22
lines changed

ios/Podfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ target 'ZulipMobile' do
1919
#
2020
# Note that if you have use_frameworks! enabled, Flipper will not work and
2121
# you should disable these next few lines.
22-
use_flipper!(
23-
'Flipper' => '0.75.1',
24-
'Flipper-Folly' => '2.5.3',
25-
'Flipper-RSocket' => '1.3.1',
26-
)
22+
use_flipper!()
2723
post_install do |installer|
2824
flipper_post_install(installer)
2925
end

ios/Podfile.lock

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -438,25 +438,25 @@ DEPENDENCIES:
438438
- EXWebBrowser (from `../node_modules/expo-web-browser/ios`)
439439
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
440440
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
441-
- Flipper (= 0.75.1)
441+
- Flipper (~> 0.75.1)
442442
- Flipper-DoubleConversion (= 1.1.7)
443-
- Flipper-Folly (= 2.5.3)
443+
- Flipper-Folly (~> 2.5.3)
444444
- Flipper-Glog (= 0.3.6)
445445
- Flipper-PeerTalk (~> 0.0.4)
446-
- Flipper-RSocket (= 1.3.1)
447-
- FlipperKit (= 0.75.1)
448-
- FlipperKit/Core (= 0.75.1)
449-
- FlipperKit/CppBridge (= 0.75.1)
450-
- FlipperKit/FBCxxFollyDynamicConvert (= 0.75.1)
451-
- FlipperKit/FBDefines (= 0.75.1)
452-
- FlipperKit/FKPortForwarding (= 0.75.1)
453-
- FlipperKit/FlipperKitHighlightOverlay (= 0.75.1)
454-
- FlipperKit/FlipperKitLayoutPlugin (= 0.75.1)
455-
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.75.1)
456-
- FlipperKit/FlipperKitNetworkPlugin (= 0.75.1)
457-
- FlipperKit/FlipperKitReactPlugin (= 0.75.1)
458-
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.75.1)
459-
- FlipperKit/SKIOSNetworkPlugin (= 0.75.1)
446+
- Flipper-RSocket (~> 1.3)
447+
- FlipperKit (~> 0.75.1)
448+
- FlipperKit/Core (~> 0.75.1)
449+
- FlipperKit/CppBridge (~> 0.75.1)
450+
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
451+
- FlipperKit/FBDefines (~> 0.75.1)
452+
- FlipperKit/FKPortForwarding (~> 0.75.1)
453+
- FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
454+
- FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
455+
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
456+
- FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
457+
- FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
458+
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
459+
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
460460
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
461461
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
462462
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -712,6 +712,6 @@ SPEC CHECKSUMS:
712712
Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac
713713
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
714714

715-
PODFILE CHECKSUM: 02b47f393048d297a31cee4132e6133d56992315
715+
PODFILE CHECKSUM: 9fe222ff44850b658732e6016d8198adb2fef518
716716

717717
COCOAPODS: 1.10.1

0 commit comments

Comments
 (0)