jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ReactNativeFlipperExample build

Browse Source 
Summary: The React Native example project was broken for iOS. Fixed this by upgrading cocoapods locally, and bumping the Flipper version.

Reviewed By: passy, priteshrnandgaonkar

Differential Revision: D26777641

fbshipit-source-id: 889ff4f9de7c44240fe0a1b5d7d3c7c0b688d8ad
This commit is contained in:
Michel Weststrate
2021-03-03 04:59:24 -08:00
committed by Facebook GitHub Bot
parent fce723eaca
commit c1ce2fad90
4 changed files with 90 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
react-native/ReactNativeFlipperExample/android/gradle.properties
View File

@@ -30,4 +30,4 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
# Version of flipper SDK to use with React Native # Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.69.0 FLIPPER_VERSION=0.78.0

2
react-native/ReactNativeFlipperExample/ios/Podfile
View File

@@ -16,7 +16,7 @@ target 'ReactNativeFlipperExample' do
# #
# Note that if you have use_frameworks! enabled, Flipper will not work and # Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable these next few lines. # you should disable these next few lines.
use_flipper!({ 'Flipper' => '0.69.0' }) use_flipper!({ 'Flipper' => '0.78.0' })
post_install do |installer| post_install do |installer|
flipper_post_install(installer) flipper_post_install(installer)
end end

102
react-native/ReactNativeFlipperExample/ios/Podfile.lock
View File

@@ -1,7 +1,6 @@
PODS: PODS:
- boost-for-react-native (1.63.0) - boost-for-react-native (1.63.0)
- CocoaAsyncSocket (7.6.5) - CocoaAsyncSocket (7.6.5)
- CocoaLibEvent (1.0.0)
- DoubleConversion (1.1.6) - DoubleConversion (1.1.6)
- FBLazyVector (0.63.4) - FBLazyVector (0.63.4)
- FBReactNativeSpec (0.63.4): - FBReactNativeSpec (0.63.4):
@@ -11,50 +10,50 @@ PODS:
- React-Core (= 0.63.4) - React-Core (= 0.63.4)
- React-jsi (= 0.63.4) - React-jsi (= 0.63.4)
- ReactCommon/turbomodule/core (= 0.63.4) - ReactCommon/turbomodule/core (= 0.63.4)
- Flipper (0.69.0): - Flipper (0.78.0):
- Flipper-Folly (~> 2.3) - Flipper-Folly (~> 2.5)
- Flipper-RSocket (~> 1.1) - Flipper-RSocket (~> 1.3)
- Flipper-DoubleConversion (1.1.7) - Flipper-DoubleConversion (1.1.7)
- Flipper-Folly (2.3.0): - Flipper-Folly (2.5.1):
- boost-for-react-native - boost-for-react-native
- CocoaLibEvent (~> 1.0)
- Flipper-DoubleConversion - Flipper-DoubleConversion
- Flipper-Glog - Flipper-Glog
- OpenSSL-Universal (= 1.0.2.20) - libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.180)
- Flipper-Glog (0.3.6) - Flipper-Glog (0.3.6)
- Flipper-PeerTalk (0.0.4) - Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.1.0): - Flipper-RSocket (1.3.0):
- Flipper-Folly (~> 2.2) - Flipper-Folly (~> 2.5)
- FlipperKit (0.69.0): - FlipperKit (0.78.0):
- FlipperKit/Core (= 0.69.0) - FlipperKit/Core (= 0.78.0)
- FlipperKit/Core (0.69.0): - FlipperKit/Core (0.78.0):
- Flipper (~> 0.69.0) - Flipper (~> 0.78.0)
- FlipperKit/CppBridge - FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines - FlipperKit/FBDefines
- FlipperKit/FKPortForwarding - FlipperKit/FKPortForwarding
- FlipperKit/CppBridge (0.69.0): - FlipperKit/CppBridge (0.78.0):
- Flipper (~> 0.69.0) - Flipper (~> 0.78.0)
- FlipperKit/FBCxxFollyDynamicConvert (0.69.0): - FlipperKit/FBCxxFollyDynamicConvert (0.78.0):
- Flipper-Folly (~> 2.3) - Flipper-Folly (~> 2.5)
- FlipperKit/FBDefines (0.69.0) - FlipperKit/FBDefines (0.78.0)
- FlipperKit/FKPortForwarding (0.69.0): - FlipperKit/FKPortForwarding (0.78.0):
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4) - Flipper-PeerTalk (~> 0.0.4)
- FlipperKit/FlipperKitHighlightOverlay (0.69.0) - FlipperKit/FlipperKitHighlightOverlay (0.78.0)
- FlipperKit/FlipperKitLayoutPlugin (0.69.0): - FlipperKit/FlipperKitLayoutPlugin (0.78.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable - FlipperKit/FlipperKitLayoutTextSearchable
- YogaKit (~> 1.18) - YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutTextSearchable (0.69.0) - FlipperKit/FlipperKitLayoutTextSearchable (0.78.0)
- FlipperKit/FlipperKitNetworkPlugin (0.69.0): - FlipperKit/FlipperKitNetworkPlugin (0.78.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitReactPlugin (0.69.0): - FlipperKit/FlipperKitReactPlugin (0.78.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitUserDefaultsPlugin (0.69.0): - FlipperKit/FlipperKitUserDefaultsPlugin (0.78.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/SKIOSNetworkPlugin (0.69.0): - FlipperKit/SKIOSNetworkPlugin (0.78.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin - FlipperKit/FlipperKitNetworkPlugin
- Folly (2020.01.13.00): - Folly (2020.01.13.00):
@@ -67,9 +66,8 @@ PODS:
- DoubleConversion - DoubleConversion
- glog - glog
- glog (0.3.5) - glog (0.3.5)
- OpenSSL-Universal (1.0.2.20): - libevent (2.1.12)
- OpenSSL-Universal/Static (= 1.0.2.20) - OpenSSL-Universal (1.1.180)
- OpenSSL-Universal/Static (1.0.2.20)
- RCTRequired (0.63.4) - RCTRequired (0.63.4)
- RCTTypeSafety (0.63.4): - RCTTypeSafety (0.63.4):
- FBLazyVector (= 0.63.4) - FBLazyVector (= 0.63.4)
@@ -306,25 +304,25 @@ DEPENDENCIES:
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
- Flipper (= 0.69.0) - Flipper (= 0.78.0)
- Flipper-DoubleConversion (= 1.1.7) - Flipper-DoubleConversion (= 1.1.7)
- Flipper-Folly (~> 2.2) - Flipper-Folly (~> 2.2)
- Flipper-Glog (= 0.3.6) - Flipper-Glog (= 0.3.6)
- Flipper-PeerTalk (~> 0.0.4) - Flipper-PeerTalk (~> 0.0.4)
- Flipper-RSocket (~> 1.1) - Flipper-RSocket (~> 1.1)
- FlipperKit (= 0.69.0) - FlipperKit (= 0.78.0)
- FlipperKit/Core (= 0.69.0) - FlipperKit/Core (= 0.78.0)
- FlipperKit/CppBridge (= 0.69.0) - FlipperKit/CppBridge (= 0.78.0)
- FlipperKit/FBCxxFollyDynamicConvert (= 0.69.0) - FlipperKit/FBCxxFollyDynamicConvert (= 0.78.0)
- FlipperKit/FBDefines (= 0.69.0) - FlipperKit/FBDefines (= 0.78.0)
- FlipperKit/FKPortForwarding (= 0.69.0) - FlipperKit/FKPortForwarding (= 0.78.0)
- FlipperKit/FlipperKitHighlightOverlay (= 0.69.0) - FlipperKit/FlipperKitHighlightOverlay (= 0.78.0)
- FlipperKit/FlipperKitLayoutPlugin (= 0.69.0) - FlipperKit/FlipperKitLayoutPlugin (= 0.78.0)
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.69.0) - FlipperKit/FlipperKitLayoutTextSearchable (= 0.78.0)
- FlipperKit/FlipperKitNetworkPlugin (= 0.69.0) - FlipperKit/FlipperKitNetworkPlugin (= 0.78.0)
- FlipperKit/FlipperKitReactPlugin (= 0.69.0) - FlipperKit/FlipperKitReactPlugin (= 0.78.0)
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.69.0) - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.78.0)
- FlipperKit/SKIOSNetworkPlugin (= 0.69.0) - FlipperKit/SKIOSNetworkPlugin (= 0.78.0)
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -356,7 +354,6 @@ SPEC REPOS:
trunk: trunk:
- boost-for-react-native - boost-for-react-native
- CocoaAsyncSocket - CocoaAsyncSocket
- CocoaLibEvent
- Flipper - Flipper
- Flipper-DoubleConversion - Flipper-DoubleConversion
- Flipper-Folly - Flipper-Folly
@@ -364,6 +361,7 @@ SPEC REPOS:
- Flipper-PeerTalk - Flipper-PeerTalk
- Flipper-RSocket - Flipper-RSocket
- FlipperKit - FlipperKit
- libevent
- OpenSSL-Universal - OpenSSL-Universal
- YogaKit - YogaKit
@@ -426,20 +424,20 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
DoubleConversion: cde416483dac037923206447da6e1454df403714 DoubleConversion: cde416483dac037923206447da6e1454df403714
FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
Flipper: 289ede5e376b23149e724b0a516817a62e65d170 Flipper: 9290a54bab5ec3a5ed985ef56c17a5f0d8dcf7c6
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5
FlipperKit: 0367d53d5c2829ea8137eaa5d1296c5fc623848b FlipperKit: f3c70dd5ec92e2fd1128c3572ca93eacf3bbb55a
Folly: b73c3869541e86821df3c387eb0af5f65addfab4 Folly: b73c3869541e86821df3c387eb0af5f65addfab4
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b
React: b0a957a2c44da4113b0c4c9853d8387f8e64e615 React: b0a957a2c44da4113b0c4c9853d8387f8e64e615
@@ -464,6 +462,6 @@ SPEC CHECKSUMS:
Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
PODFILE CHECKSUM: 686ae8e0aefc7e383f7687071e194449417fb051 PODFILE CHECKSUM: 6acbe2be4944d5253e5cc65e0342e0167c3793d9
COCOAPODS: 1.9.3 COCOAPODS: 1.10.1

38
react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj
View File

@@ -209,6 +209,7 @@
00E356EB1AD99517003FC87E /* Frameworks */, 00E356EB1AD99517003FC87E /* Frameworks */,
00E356EC1AD99517003FC87E /* Resources */, 00E356EC1AD99517003FC87E /* Resources */,
4B4AFCCBB0879333439F0C1B /* [CP] Copy Pods Resources */, 4B4AFCCBB0879333439F0C1B /* [CP] Copy Pods Resources */,
B24E221E239721B6070E494D /* [CP] Embed Pods Frameworks */,
); );
buildRules = ( buildRules = (
); );
@@ -231,6 +232,7 @@
13B07F8E1A680F5B00A75B9A /* Resources */, 13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
FC3B49C295CE038DA736697B /* [CP] Copy Pods Resources */, FC3B49C295CE038DA736697B /* [CP] Copy Pods Resources */,
54657F67A8B20968B992E325 /* [CP] Embed Pods Frameworks */,
); );
buildRules = ( buildRules = (
); );
@@ -430,6 +432,24 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests-resources.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests-resources.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
54657F67A8B20968B992E325 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample/Pods-ReactNativeFlipperExample-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample/Pods-ReactNativeFlipperExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
A6CBA30D2571EA0A4774400E /* [CP] Check Pods Manifest.lock */ = { A6CBA30D2571EA0A4774400E /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@@ -474,6 +494,24 @@
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"; 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";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
B24E221E239721B6070E494D /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
EF8F7CC3E6A26470CD1E3653 /* [CP] Check Pods Manifest.lock */ = { EF8F7CC3E6A26470CD1E3653 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;