Skip to content

Commit 7159bcb

Browse files
janicduplessisgrabbou
janicduplessis
authored and
grabbou
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). [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 e846740 commit 7159bcb

5 files changed

Lines changed: 86 additions & 62 deletions

File tree

‎packages/rn-tester/Podfile.lock‎

Lines changed: 55 additions & 52 deletions
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
@@ -654,25 +652,25 @@ DEPENDENCIES:
654652
- DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
655653
- FBLazyVector (from `../../Libraries/FBLazyVector`)
656654
- FBReactNativeSpec (from `../../React/FBReactNativeSpec`)
657-
- Flipper (~> 0.54.0)
655+
- Flipper (~> 0.75.1)
658656
- Flipper-DoubleConversion (= 1.1.7)
659-
- Flipper-Folly (~> 2.2)
657+
- Flipper-Folly (~> 2.5)
660658
- Flipper-Glog (= 0.3.6)
661659
- Flipper-PeerTalk (~> 0.0.4)
662-
- Flipper-RSocket (~> 1.1)
663-
- FlipperKit (~> 0.54.0)
664-
- FlipperKit/Core (~> 0.54.0)
665-
- FlipperKit/CppBridge (~> 0.54.0)
666-
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0)
667-
- FlipperKit/FBDefines (~> 0.54.0)
668-
- FlipperKit/FKPortForwarding (~> 0.54.0)
669-
- FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0)
670-
- FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0)
671-
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0)
672-
- FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0)
673-
- FlipperKit/FlipperKitReactPlugin (~> 0.54.0)
674-
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0)
675-
- FlipperKit/SKIOSNetworkPlugin (~> 0.54.0)
660+
- Flipper-RSocket (~> 1.3)
661+
- FlipperKit (~> 0.75.1)
662+
- FlipperKit/Core (~> 0.75.1)
663+
- FlipperKit/CppBridge (~> 0.75.1)
664+
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
665+
- FlipperKit/FBDefines (~> 0.75.1)
666+
- FlipperKit/FKPortForwarding (~> 0.75.1)
667+
- FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
668+
- FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
669+
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
670+
- FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
671+
- FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
672+
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
673+
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
676674
- glog (from `../../third-party-podspecs/glog.podspec`)
677675
- RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
678676
- RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`)
@@ -713,14 +711,14 @@ SPEC REPOS:
713711
trunk:
714712
- boost-for-react-native
715713
- CocoaAsyncSocket
716-
- CocoaLibEvent
717714
- Flipper
718715
- Flipper-DoubleConversion
719716
- Flipper-Folly
720717
- Flipper-Glog
721718
- Flipper-PeerTalk
722719
- Flipper-RSocket
723720
- FlipperKit
721+
- libevent
724722
- OpenSSL-Universal
725723
- YogaKit
726724

@@ -795,19 +793,24 @@ EXTERNAL SOURCES:
795793
SPEC CHECKSUMS:
796794
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
797795
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
798-
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
799796
DoubleConversion: cde416483dac037923206447da6e1454df403714
800797
FBLazyVector: 91e874a8823933a268c38765a88cbd5dba1fa024
798+
<<<<<<< HEAD
801799
FBReactNativeSpec: 58a907f57c40ca74a954abe86862baa5eb423c63
802800
Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
801+
=======
802+
FBReactNativeSpec: 6793f00102a091fb931674853172fb22e5a2c4cf
803+
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
804+
>>>>>>> 3399896ae75... Update flipper in RNTester and template (#31010)
803805
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
804-
Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a
806+
Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
805807
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
806808
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
807-
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
808-
FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
809+
Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5
810+
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
809811
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
810-
OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd
812+
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
813+
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
811814
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
812815
RCTRequired: d3d4ce60e1e2282864d7560340690a3c8c646de1
813816
RCTTypeSafety: 4da4f9f218727257c50fd3bf2683a06cdb4fede3
@@ -839,6 +842,6 @@ SPEC CHECKSUMS:
839842
Yoga: e37ade282f73232191786671781d052c84d0faa8
840843
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
841844

842-
PODFILE CHECKSUM: 486f12ff39a0c690fe414d7ffbbdaa371d51590b
845+
PODFILE CHECKSUM: 6e910a576b7db9347c60dfc58f7852f692200116
843846

844847
COCOAPODS: 1.10.0

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

Lines changed: 25 additions & 4 deletions
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 */,
@@ -665,6 +667,23 @@
665667
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";
666668
showEnvVarsInLog = 0;
667669
};
670+
FCBC860F39D3E385BA7C6FF7 /* [CP] Embed Pods Frameworks */ = {
671+
isa = PBXShellScriptBuildPhase;
672+
buildActionMask = 2147483647;
673+
files = (
674+
);
675+
inputFileListPaths = (
676+
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-input-files.xcfilelist",
677+
);
678+
name = "[CP] Embed Pods Frameworks";
679+
outputFileListPaths = (
680+
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-output-files.xcfilelist",
681+
);
682+
runOnlyForDeploymentPostprocessing = 0;
683+
shellPath = /bin/sh;
684+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks.sh\"\n";
685+
showEnvVarsInLog = 0;
686+
};
668687
/* End PBXShellScriptBuildPhase section */
669688

670689
/* Begin PBXSourcesBuildPhase section */
@@ -748,9 +767,8 @@
748767
isa = XCBuildConfiguration;
749768
baseConfigurationReference = 98233960D1D6A1977D1C7EAF /* Pods-RNTester.debug.xcconfig */;
750769
buildSettings = {
751-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
752770
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
753-
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
771+
CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
754772
DEVELOPMENT_TEAM = "";
755773
GCC_PREPROCESSOR_DEFINITIONS = (
756774
"$(inherited)",
@@ -761,6 +779,7 @@
761779
LD_RUNPATH_SEARCH_PATHS = (
762780
/usr/lib/swift,
763781
"$(inherited)",
782+
"@executable_path/Frameworks",
764783
);
765784
LIBRARY_SEARCH_PATHS = (
766785
"$(inherited)",
@@ -790,16 +809,16 @@
790809
isa = XCBuildConfiguration;
791810
baseConfigurationReference = 5BEC8567F3741044B6A5EFC5 /* Pods-RNTester.release.xcconfig */;
792811
buildSettings = {
793-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
794812
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
795-
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
813+
CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
796814
DEVELOPMENT_TEAM = "";
797815
EXCLUDED_ARCHS = "";
798816
INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
799817
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
800818
LD_RUNPATH_SEARCH_PATHS = (
801819
/usr/lib/swift,
802820
"$(inherited)",
821+
"@executable_path/Frameworks",
803822
);
804823
LIBRARY_SEARCH_PATHS = (
805824
"$(inherited)",
@@ -861,6 +880,7 @@
861880
ENABLE_BITCODE = NO;
862881
ENABLE_STRICT_OBJC_MSGSEND = YES;
863882
ENABLE_TESTABILITY = YES;
883+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
864884
GCC_C_LANGUAGE_STANDARD = gnu11;
865885
GCC_DYNAMIC_NO_PIC = NO;
866886
GCC_NO_COMMON_BLOCKS = YES;
@@ -944,6 +964,7 @@
944964
ENABLE_BITCODE = NO;
945965
ENABLE_NS_ASSERTIONS = NO;
946966
ENABLE_STRICT_OBJC_MSGSEND = YES;
967+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
947968
GCC_C_LANGUAGE_STANDARD = gnu11;
948969
GCC_NO_COMMON_BLOCKS = YES;
949970
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ def use_react_native! (options={})
6464
if hermes_enabled
6565
pod 'React-Core/Hermes', :path => "#{prefix}/"
6666
pod 'hermes-engine', '~> 0.7.2'
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‎

Lines changed: 1 addition & 1 deletion
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)
⚡