Skip to content

Commit 3399896

Browse files
janicduplessisfacebook-github-bot
janicduplessis
authored and
facebook-github-bot
committed
Update flipper in RNTester and template (#31010)
Summary: allow-large-files RN Tester is using an old version of Flipper. This will help testing regressions in the latest version (which is installed when starting a new project). This also fixes an issue where libevent is incompatible between the one in flipper and when using hermes on iOS. To fix it I changed to use the version published on cocoapods instead of using a local podspec (see facebook/flipper#1916). ## Changelog [General] [Changed] - Update flipper Pull Request resolved: #31010 Test Plan: - Tested that RN tester builds and flipper works with hermes enabled / disabled and fabric on iOS - Tested that RN tester builds and flipper works on Android Reviewed By: fkgozali Differential Revision: D26592317 Pulled By: PeteTheHeat fbshipit-source-id: 2cd278c7a51b1859dab0465846b061221f07d3f6
1 parent 86321a3 commit 3399896

File tree

7 files changed

+84
-631
lines changed

7 files changed

+84
-631
lines changed

‎packages/rn-tester/Podfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,5 @@ target 'RNTesterIntegrationTests' do
5757
end
5858

5959
post_install do |installer|
60-
if !USE_FRAMEWORKS
61-
flipper_post_install(installer)
62-
end
60+
react_native_post_install(installer)
6361
end

‎packages/rn-tester/Podfile.lock

+51-53
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
PODS:
22
- boost-for-react-native (1.63.0)
33
- CocoaAsyncSocket (7.6.5)
4-
- CocoaLibEvent (1.0.0)
54
- DoubleConversion (1.1.6)
65
- FBLazyVector (1000.0.0)
76
- FBReactNativeSpec (1000.0.0):
@@ -11,56 +10,55 @@ PODS:
1110
- React-Core (= 1000.0.0)
1211
- React-jsi (= 1000.0.0)
1312
- ReactCommon/turbomodule/core (= 1000.0.0)
14-
- Flipper (0.54.0):
15-
- Flipper-Folly (~> 2.2)
16-
- Flipper-RSocket (~> 1.1)
13+
- Flipper (0.75.1):
14+
- Flipper-Folly (~> 2.5)
15+
- Flipper-RSocket (~> 1.3)
1716
- Flipper-DoubleConversion (1.1.7)
18-
- Flipper-Folly (2.3.0):
17+
- Flipper-Folly (2.5.1):
1918
- boost-for-react-native
20-
- CocoaLibEvent (~> 1.0)
2119
- Flipper-DoubleConversion
2220
- Flipper-Glog
23-
- OpenSSL-Universal (= 1.0.2.20)
21+
- libevent (~> 2.1.12)
22+
- OpenSSL-Universal (= 1.1.180)
2423
- Flipper-Glog (0.3.6)
2524
- Flipper-PeerTalk (0.0.4)
26-
- Flipper-RSocket (1.1.0):
27-
- Flipper-Folly (~> 2.2)
28-
- FlipperKit (0.54.0):
29-
- FlipperKit/Core (= 0.54.0)
30-
- FlipperKit/Core (0.54.0):
31-
- Flipper (~> 0.54.0)
25+
- Flipper-RSocket (1.3.0):
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)
3231
- FlipperKit/CppBridge
3332
- FlipperKit/FBCxxFollyDynamicConvert
3433
- FlipperKit/FBDefines
3534
- FlipperKit/FKPortForwarding
36-
- FlipperKit/CppBridge (0.54.0):
37-
- Flipper (~> 0.54.0)
38-
- FlipperKit/FBCxxFollyDynamicConvert (0.54.0):
39-
- Flipper-Folly (~> 2.2)
40-
- FlipperKit/FBDefines (0.54.0)
41-
- FlipperKit/FKPortForwarding (0.54.0):
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):
4241
- CocoaAsyncSocket (~> 7.6)
4342
- Flipper-PeerTalk (~> 0.0.4)
44-
- FlipperKit/FlipperKitHighlightOverlay (0.54.0)
45-
- FlipperKit/FlipperKitLayoutPlugin (0.54.0):
43+
- FlipperKit/FlipperKitHighlightOverlay (0.75.1)
44+
- FlipperKit/FlipperKitLayoutPlugin (0.75.1):
4645
- FlipperKit/Core
4746
- FlipperKit/FlipperKitHighlightOverlay
4847
- FlipperKit/FlipperKitLayoutTextSearchable
4948
- YogaKit (~> 1.18)
50-
- FlipperKit/FlipperKitLayoutTextSearchable (0.54.0)
51-
- FlipperKit/FlipperKitNetworkPlugin (0.54.0):
49+
- FlipperKit/FlipperKitLayoutTextSearchable (0.75.1)
50+
- FlipperKit/FlipperKitNetworkPlugin (0.75.1):
5251
- FlipperKit/Core
53-
- FlipperKit/FlipperKitReactPlugin (0.54.0):
52+
- FlipperKit/FlipperKitReactPlugin (0.75.1):
5453
- FlipperKit/Core
55-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0):
54+
- FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1):
5655
- FlipperKit/Core
57-
- FlipperKit/SKIOSNetworkPlugin (0.54.0):
56+
- FlipperKit/SKIOSNetworkPlugin (0.75.1):
5857
- FlipperKit/Core
5958
- FlipperKit/FlipperKitNetworkPlugin
6059
- glog (0.3.5)
61-
- OpenSSL-Universal (1.0.2.20):
62-
- OpenSSL-Universal/Static (= 1.0.2.20)
63-
- OpenSSL-Universal/Static (1.0.2.20)
60+
- libevent (2.1.12)
61+
- OpenSSL-Universal (1.1.180)
6462
- RCT-Folly (2020.01.13.00):
6563
- boost-for-react-native
6664
- DoubleConversion
@@ -663,25 +661,25 @@ DEPENDENCIES:
663661
- DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
664662
- FBLazyVector (from `../../Libraries/FBLazyVector`)
665663
- FBReactNativeSpec (from `../../React/FBReactNativeSpec`)
666-
- Flipper (~> 0.54.0)
664+
- Flipper (~> 0.75.1)
667665
- Flipper-DoubleConversion (= 1.1.7)
668-
- Flipper-Folly (~> 2.2)
666+
- Flipper-Folly (~> 2.5)
669667
- Flipper-Glog (= 0.3.6)
670668
- Flipper-PeerTalk (~> 0.0.4)
671-
- Flipper-RSocket (~> 1.1)
672-
- FlipperKit (~> 0.54.0)
673-
- FlipperKit/Core (~> 0.54.0)
674-
- FlipperKit/CppBridge (~> 0.54.0)
675-
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0)
676-
- FlipperKit/FBDefines (~> 0.54.0)
677-
- FlipperKit/FKPortForwarding (~> 0.54.0)
678-
- FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0)
679-
- FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0)
680-
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0)
681-
- FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0)
682-
- FlipperKit/FlipperKitReactPlugin (~> 0.54.0)
683-
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0)
684-
- FlipperKit/SKIOSNetworkPlugin (~> 0.54.0)
669+
- Flipper-RSocket (~> 1.3)
670+
- FlipperKit (~> 0.75.1)
671+
- FlipperKit/Core (~> 0.75.1)
672+
- FlipperKit/CppBridge (~> 0.75.1)
673+
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
674+
- FlipperKit/FBDefines (~> 0.75.1)
675+
- FlipperKit/FKPortForwarding (~> 0.75.1)
676+
- FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
677+
- FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
678+
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
679+
- FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
680+
- FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
681+
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
682+
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
685683
- glog (from `../../third-party-podspecs/glog.podspec`)
686684
- RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
687685
- RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`)
@@ -722,14 +720,14 @@ SPEC REPOS:
722720
trunk:
723721
- boost-for-react-native
724722
- CocoaAsyncSocket
725-
- CocoaLibEvent
726723
- Flipper
727724
- Flipper-DoubleConversion
728725
- Flipper-Folly
729726
- Flipper-Glog
730727
- Flipper-PeerTalk
731728
- Flipper-RSocket
732729
- FlipperKit
730+
- libevent
733731
- OpenSSL-Universal
734732
- YogaKit
735733

@@ -804,19 +802,19 @@ EXTERNAL SOURCES:
804802
SPEC CHECKSUMS:
805803
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
806804
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
807-
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
808805
DoubleConversion: cde416483dac037923206447da6e1454df403714
809806
FBLazyVector: 91e874a8823933a268c38765a88cbd5dba1fa024
810807
FBReactNativeSpec: 6793f00102a091fb931674853172fb22e5a2c4cf
811-
Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
808+
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
812809
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
813-
Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a
810+
Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
814811
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
815812
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
816-
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
817-
FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
813+
Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5
814+
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
818815
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
819-
OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd
816+
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
817+
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
820818
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
821819
RCTRequired: 047bd218d23dbe95d2a933eb5030a269d2a42929
822820
RCTTypeSafety: c2fc670603ca48eb4c1230091eaffb422e6d0d4d
@@ -848,6 +846,6 @@ SPEC CHECKSUMS:
848846
Yoga: 69c2b21737d8220f647e61141aec8c28f7249ef2
849847
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
850848

851-
PODFILE CHECKSUM: 799678aa4c11e7c6d8a431a3883e94b09b8dd0f1
849+
PODFILE CHECKSUM: 6e910a576b7db9347c60dfc58f7852f692200116
852850

853851
COCOAPODS: 1.10.1

‎packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

+26-4
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
/* End PBXContainerItemProxy section */
7878

7979
/* Begin PBXFileReference section */
80+
0CC3BE1A25DDB68A0033CAEB /* RNTester.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = RNTester.entitlements; path = RNTester/RNTester.entitlements; sourceTree = "<group>"; };
8081
13B07F961A680F5B00A75B9A /* RNTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RNTester.app; sourceTree = BUILT_PRODUCTS_DIR; };
8182
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = RNTester/AppDelegate.h; sourceTree = "<group>"; };
8283
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = "<group>"; };
@@ -219,6 +220,7 @@
219220
13B07FAE1A68108700A75B9A /* RNTester */ = {
220221
isa = PBXGroup;
221222
children = (
223+
0CC3BE1A25DDB68A0033CAEB /* RNTester.entitlements */,
222224
E771AEEA22B44E3100EA1189 /* Info.plist */,
223225
13B07FAF1A68108700A75B9A /* AppDelegate.h */,
224226
5C60EB1B226440DB0018C04F /* AppDelegate.mm */,
@@ -406,6 +408,7 @@
406408
68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */,
407409
5CF0FD27207FC6EC00C13D65 /* Start Metro */,
408410
CD2B49A7F80C8171E7A5B233 /* [CP] Copy Pods Resources */,
411+
FCBC860F39D3E385BA7C6FF7 /* [CP] Embed Pods Frameworks */,
409412
);
410413
buildRules = (
411414
);
@@ -665,6 +668,23 @@
665668
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
666669
showEnvVarsInLog = 0;
667670
};
671+
FCBC860F39D3E385BA7C6FF7 /* [CP] Embed Pods Frameworks */ = {
672+
isa = PBXShellScriptBuildPhase;
673+
buildActionMask = 2147483647;
674+
files = (
675+
);
676+
inputFileListPaths = (
677+
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-input-files.xcfilelist",
678+
);
679+
name = "[CP] Embed Pods Frameworks";
680+
outputFileListPaths = (
681+
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-output-files.xcfilelist",
682+
);
683+
runOnlyForDeploymentPostprocessing = 0;
684+
shellPath = /bin/sh;
685+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks.sh\"\n";
686+
showEnvVarsInLog = 0;
687+
};
668688
/* End PBXShellScriptBuildPhase section */
669689

670690
/* Begin PBXSourcesBuildPhase section */
@@ -748,15 +768,15 @@
748768
isa = XCBuildConfiguration;
749769
baseConfigurationReference = 98233960D1D6A1977D1C7EAF /* Pods-RNTester.debug.xcconfig */;
750770
buildSettings = {
751-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
752771
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
753-
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
772+
CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
754773
DEVELOPMENT_TEAM = "";
755774
INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
756775
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
757776
LD_RUNPATH_SEARCH_PATHS = (
758777
/usr/lib/swift,
759778
"$(inherited)",
779+
"@executable_path/Frameworks",
760780
);
761781
LIBRARY_SEARCH_PATHS = (
762782
"$(inherited)",
@@ -781,16 +801,16 @@
781801
isa = XCBuildConfiguration;
782802
baseConfigurationReference = 5BEC8567F3741044B6A5EFC5 /* Pods-RNTester.release.xcconfig */;
783803
buildSettings = {
784-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
785804
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
786-
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
805+
CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
787806
DEVELOPMENT_TEAM = "";
788807
EXCLUDED_ARCHS = "";
789808
INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
790809
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
791810
LD_RUNPATH_SEARCH_PATHS = (
792811
/usr/lib/swift,
793812
"$(inherited)",
813+
"@executable_path/Frameworks",
794814
);
795815
LIBRARY_SEARCH_PATHS = (
796816
"$(inherited)",
@@ -847,6 +867,7 @@
847867
ENABLE_BITCODE = NO;
848868
ENABLE_STRICT_OBJC_MSGSEND = YES;
849869
ENABLE_TESTABILITY = YES;
870+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
850871
GCC_C_LANGUAGE_STANDARD = gnu11;
851872
GCC_DYNAMIC_NO_PIC = NO;
852873
GCC_NO_COMMON_BLOCKS = YES;
@@ -930,6 +951,7 @@
930951
ENABLE_BITCODE = NO;
931952
ENABLE_NS_ASSERTIONS = NO;
932953
ENABLE_STRICT_OBJC_MSGSEND = YES;
954+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
933955
GCC_C_LANGUAGE_STANDARD = gnu11;
934956
GCC_NO_COMMON_BLOCKS = YES;
935957
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;

‎packages/rn-tester/android/app/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ android.useAndroidX=true
1010
android.enableJetifier=true
1111

1212
# Version of flipper SDK to use with React Native
13-
FLIPPER_VERSION=0.54.0
13+
FLIPPER_VERSION=0.75.1

‎scripts/react_native_pods.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ def use_react_native! (options={})
6464
if hermes_enabled
6565
pod 'React-hermes', :path => "#{prefix}/ReactCommon/hermes"
6666
pod 'hermes-engine'
67-
pod 'libevent', :podspec => "#{prefix}/third-party-podspecs/libevent.podspec"
67+
pod 'libevent', '~> 2.1.12'
6868
end
6969
end
7070

7171
def use_flipper!(versions = {}, configurations: ['Debug'])
72-
versions['Flipper'] ||= '~> 0.54.0'
72+
versions['Flipper'] ||= '~> 0.75.1'
7373
versions['Flipper-DoubleConversion'] ||= '1.1.7'
74-
versions['Flipper-Folly'] ||= '~> 2.2'
74+
versions['Flipper-Folly'] ||= '~> 2.5'
7575
versions['Flipper-Glog'] ||= '0.3.6'
7676
versions['Flipper-PeerTalk'] ||= '~> 0.0.4'
77-
versions['Flipper-RSocket'] ||= '~> 1.1'
77+
versions['Flipper-RSocket'] ||= '~> 1.3'
7878
pod 'FlipperKit', versions['Flipper'], :configurations => configurations
7979
pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configurations => configurations
8080
pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configurations => configurations

‎template/android/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.54.0
28+
FLIPPER_VERSION=0.75.1

0 commit comments

Comments
 (0)