Skip to content

Commit 4246c75

Browse files
mweststratefacebook-github-bot
mweststrate
authored and
facebook-github-bot
committed
Bump flipper deps to 0.91 to support XCode 12.5 out of the box (#31562)
Summary: allow-large-files This bumps the flipper dependencies to 0.91. Fresco deps are not in mavenCentral jet, so picked those from bintray, but pinged the team and they'll follow up on it. See also: facebook/fresco#2603 This primarily bumps to the latest pods we have everywhere, which solves several build issues, like reported in #31480 After this change it should no longer be needed to pass custom version overrides to `use_flipper`, as the defaults will be up to date. In the template project, I changed the version rangers to exact numbers, so that results of `react-native init` are more consistent / predictable over time, as suggested in the discord channel by Brent In the long term we are investigating whether we can remove most of the transitive deps by not using RSocket, which is a bigger project plan that should help reduce build issues and times, especially on iOS. cc priteshrnandgaonkar passy kelset ## Changelog [general][changed] - [iOS] Update Flipper to 0.91.1, fixed iOS build support for i386, `use_flipper!()` will no longer need custom overrides to build with XCode 12.5 Pull Request resolved: #31562 Test Plan: _N.B. Locally tested in XCode 12.4 only, but bumped versions have been confirmed to work on 12.5 before by others_ * React Native CI * Flipper CI with same versions of deps: https://github.com/facebook/flipper/actions/runs/863607686 * Was able to connect from both Android and iOS to Flipper. Couldn't really test further due to a bundling error I didn't understand, suggestions welcome ![Screenshot 2021-05-21 at 11 32 52](https://user-images.githubusercontent.com/1820292/119133806-3d090880-ba34-11eb-8c0b-1ede7bc13751.png) ![Screenshot 2021-05-21 at 12 59 13](https://user-images.githubusercontent.com/1820292/119133892-5c079a80-ba34-11eb-9e72-278c427fdeb0.png) Reviewed By: fkgozali Differential Revision: D28623601 Pulled By: mweststrate fbshipit-source-id: 22130d07821569851956453c4ee6a594b6b83928
1 parent c774f9e commit 4246c75

File tree

2 files changed

+77
-53
lines changed

2 files changed

+77
-53
lines changed

‎packages/rn-tester/Podfile.lock

+68-48
Original file line numberDiff line numberDiff line change
@@ -10,50 +10,64 @@ PODS:
1010
- React-Core (= 1000.0.0)
1111
- React-jsi (= 1000.0.0)
1212
- ReactCommon/turbomodule/core (= 1000.0.0)
13-
- Flipper (0.75.1):
14-
- Flipper-Folly (~> 2.5)
15-
- Flipper-RSocket (~> 1.3)
16-
- Flipper-DoubleConversion (1.1.7)
17-
- Flipper-Folly (2.5.3):
18-
- boost-for-react-native
13+
- Flipper (0.91.1):
14+
- Flipper-Folly (~> 2.6)
15+
- Flipper-RSocket (~> 1.4)
16+
- Flipper-Boost-iOSX (1.76.0.1.11)
17+
- Flipper-DoubleConversion (3.1.7)
18+
- Flipper-Fmt (7.1.7)
19+
- Flipper-Folly (2.6.7):
20+
- Flipper-Boost-iOSX
1921
- Flipper-DoubleConversion
22+
- Flipper-Fmt (= 7.1.7)
2023
- Flipper-Glog
2124
- libevent (~> 2.1.12)
2225
- OpenSSL-Universal (= 1.1.180)
2326
- Flipper-Glog (0.3.6)
2427
- Flipper-PeerTalk (0.0.4)
25-
- Flipper-RSocket (1.3.1):
26-
- Flipper-Folly (~> 2.5)
27-
- FlipperKit (0.75.1):
28-
- FlipperKit/Core (= 0.75.1)
29-
- FlipperKit/Core (0.75.1):
30-
- Flipper (~> 0.75.1)
28+
- Flipper-RSocket (1.4.3):
29+
- Flipper-Folly (~> 2.6)
30+
- FlipperKit (0.91.1):
31+
- FlipperKit/Core (= 0.91.1)
32+
- FlipperKit/Core (0.91.1):
33+
- Flipper (~> 0.91.1)
3134
- FlipperKit/CppBridge
3235
- FlipperKit/FBCxxFollyDynamicConvert
3336
- FlipperKit/FBDefines
3437
- FlipperKit/FKPortForwarding
35-
- FlipperKit/CppBridge (0.75.1):
36-
- Flipper (~> 0.75.1)
37-
- FlipperKit/FBCxxFollyDynamicConvert (0.75.1):
38-
- Flipper-Folly (~> 2.5)
39-
- FlipperKit/FBDefines (0.75.1)
40-
- FlipperKit/FKPortForwarding (0.75.1):
38+
- FlipperKit/CppBridge (0.91.1):
39+
- Flipper (~> 0.91.1)
40+
- FlipperKit/FBCxxFollyDynamicConvert (0.91.1):
41+
- Flipper-Folly (~> 2.6)
42+
- FlipperKit/FBDefines (0.91.1)
43+
- FlipperKit/FKPortForwarding (0.91.1):
4144
- CocoaAsyncSocket (~> 7.6)
4245
- Flipper-PeerTalk (~> 0.0.4)
43-
- FlipperKit/FlipperKitHighlightOverlay (0.75.1)
44-
- FlipperKit/FlipperKitLayoutPlugin (0.75.1):
46+
- FlipperKit/FlipperKitHighlightOverlay (0.91.1)
47+
- FlipperKit/FlipperKitLayoutHelpers (0.91.1):
48+
- FlipperKit/Core
49+
- FlipperKit/FlipperKitHighlightOverlay
50+
- FlipperKit/FlipperKitLayoutTextSearchable
51+
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.91.1):
52+
- FlipperKit/Core
53+
- FlipperKit/FlipperKitHighlightOverlay
54+
- FlipperKit/FlipperKitLayoutHelpers
55+
- YogaKit (~> 1.18)
56+
- FlipperKit/FlipperKitLayoutPlugin (0.91.1):
4557
- FlipperKit/Core
4658
- FlipperKit/FlipperKitHighlightOverlay
59+
- FlipperKit/FlipperKitLayoutHelpers
60+
- FlipperKit/FlipperKitLayoutIOSDescriptors
4761
- FlipperKit/FlipperKitLayoutTextSearchable
4862
- YogaKit (~> 1.18)
49-
- FlipperKit/FlipperKitLayoutTextSearchable (0.75.1)
50-
- FlipperKit/FlipperKitNetworkPlugin (0.75.1):
63+
- FlipperKit/FlipperKitLayoutTextSearchable (0.91.1)
64+
- FlipperKit/FlipperKitNetworkPlugin (0.91.1):
5165
- FlipperKit/Core
52-
- FlipperKit/FlipperKitReactPlugin (0.75.1):
66+
- FlipperKit/FlipperKitReactPlugin (0.91.1):
5367
- FlipperKit/Core
54-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1):
68+
- FlipperKit/FlipperKitUserDefaultsPlugin (0.91.1):
5569
- FlipperKit/Core
56-
- FlipperKit/SKIOSNetworkPlugin (0.75.1):
70+
- FlipperKit/SKIOSNetworkPlugin (0.91.1):
5771
- FlipperKit/Core
5872
- FlipperKit/FlipperKitNetworkPlugin
5973
- fmt (6.2.1)
@@ -701,25 +715,27 @@ DEPENDENCIES:
701715
- DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
702716
- FBLazyVector (from `../../Libraries/FBLazyVector`)
703717
- FBReactNativeSpec (from `../../React/FBReactNativeSpec`)
704-
- Flipper (~> 0.75.1)
705-
- Flipper-DoubleConversion (= 1.1.7)
706-
- Flipper-Folly (~> 2.5.3)
718+
- Flipper (= 0.91.1)
719+
- Flipper-Boost-iOSX (= 1.76.0.1.11)
720+
- Flipper-DoubleConversion (= 3.1.7)
721+
- Flipper-Fmt (= 7.1.7)
722+
- Flipper-Folly (= 2.6.7)
707723
- Flipper-Glog (= 0.3.6)
708-
- Flipper-PeerTalk (~> 0.0.4)
709-
- Flipper-RSocket (~> 1.3)
710-
- FlipperKit (~> 0.75.1)
711-
- FlipperKit/Core (~> 0.75.1)
712-
- FlipperKit/CppBridge (~> 0.75.1)
713-
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
714-
- FlipperKit/FBDefines (~> 0.75.1)
715-
- FlipperKit/FKPortForwarding (~> 0.75.1)
716-
- FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
717-
- FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
718-
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
719-
- FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
720-
- FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
721-
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
722-
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
724+
- Flipper-PeerTalk (= 0.0.4)
725+
- Flipper-RSocket (= 1.4.3)
726+
- FlipperKit (= 0.91.1)
727+
- FlipperKit/Core (= 0.91.1)
728+
- FlipperKit/CppBridge (= 0.91.1)
729+
- FlipperKit/FBCxxFollyDynamicConvert (= 0.91.1)
730+
- FlipperKit/FBDefines (= 0.91.1)
731+
- FlipperKit/FKPortForwarding (= 0.91.1)
732+
- FlipperKit/FlipperKitHighlightOverlay (= 0.91.1)
733+
- FlipperKit/FlipperKitLayoutPlugin (= 0.91.1)
734+
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.91.1)
735+
- FlipperKit/FlipperKitNetworkPlugin (= 0.91.1)
736+
- FlipperKit/FlipperKitReactPlugin (= 0.91.1)
737+
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.91.1)
738+
- FlipperKit/SKIOSNetworkPlugin (= 0.91.1)
723739
- glog (from `../../third-party-podspecs/glog.podspec`)
724740
- RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
725741
- RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`)
@@ -761,7 +777,9 @@ SPEC REPOS:
761777
- boost-for-react-native
762778
- CocoaAsyncSocket
763779
- Flipper
780+
- Flipper-Boost-iOSX
764781
- Flipper-DoubleConversion
782+
- Flipper-Fmt
765783
- Flipper-Folly
766784
- Flipper-Glog
767785
- Flipper-PeerTalk
@@ -846,13 +864,15 @@ SPEC CHECKSUMS:
846864
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
847865
FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949
848866
FBReactNativeSpec: 9317c06a8fcc6ff3de6f045d45186523d4fe3458
849-
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
850-
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
851-
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
867+
Flipper: 0f8a5accb30d2ec9c3e85e820ce00c3b72a486f3
868+
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
869+
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
870+
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
871+
Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a
852872
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
853873
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
854-
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
855-
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
874+
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
875+
FlipperKit: 4bce4a1dc0b2178ad9cbb2a2c9ca0b5e5c0ecfdc
856876
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
857877
glog: 5337263514dd6f09803962437687240c5dc39aa4
858878
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913

‎scripts/react_native_pods.rb

+9-5
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,14 @@ def use_react_native! (options={})
6969
end
7070

7171
def use_flipper!(versions = {}, configurations: ['Debug'])
72-
versions['Flipper'] ||= '~> 0.75.1'
73-
versions['Flipper-DoubleConversion'] ||= '1.1.7'
74-
versions['Flipper-Folly'] ||= '~> 2.5.3'
72+
versions['Flipper'] ||= '0.91.1'
73+
versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11'
74+
versions['Flipper-DoubleConversion'] ||= '3.1.7'
75+
versions['Flipper-Fmt'] ||= '7.1.7'
76+
versions['Flipper-Folly'] ||= '2.6.7'
7577
versions['Flipper-Glog'] ||= '0.3.6'
76-
versions['Flipper-PeerTalk'] ||= '~> 0.0.4'
77-
versions['Flipper-RSocket'] ||= '~> 1.3'
78+
versions['Flipper-PeerTalk'] ||= '0.0.4'
79+
versions['Flipper-RSocket'] ||= '1.4.3'
7880
pod 'FlipperKit', versions['Flipper'], :configurations => configurations
7981
pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configurations => configurations
8082
pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configurations => configurations
@@ -83,7 +85,9 @@ def use_flipper!(versions = {}, configurations: ['Debug'])
8385
# List all transitive dependencies for FlipperKit pods
8486
# to avoid them being linked in Release builds
8587
pod 'Flipper', versions['Flipper'], :configurations => configurations
88+
pod 'Flipper-Boost-iOSX', versions['Flipper-Boost-iOSX'], :configurations => configurations
8689
pod 'Flipper-DoubleConversion', versions['Flipper-DoubleConversion'], :configurations => configurations
90+
pod 'Flipper-Fmt', versions['Flipper-Fmt'], :configurations => configurations
8791
pod 'Flipper-Folly', versions['Flipper-Folly'], :configurations => configurations
8892
pod 'Flipper-Glog', versions['Flipper-Glog'], :configurations => configurations
8993
pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configurations => configurations

0 commit comments

Comments
 (0)