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

Bump all Pods to latest (#2275)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/flipper/pull/2275

Forced all current pods to use the latest available. If this builds successfully, will create a PR against React Native so that they become the default, and remove them here again.

This job currently does limit the architectures we build for. Pritesh is investigating if we can wide that again, as this might not be acceptable to RN in general.

This doesn't bump the android version to 0.88, as the artifact publishing failed for that version, but since there are currently less problems with the Android version I wanted to go ahead with just iOS.

Reviewed By: cekkaewnumchai, priteshrnandgaonkar

Differential Revision: D28257283

fbshipit-source-id: a631b1c354617ed356cd1e74b9e8e8aa050eed60
This commit is contained in:
Michel Weststrate
2021-05-07 05:04:21 -07:00
committed by Facebook GitHub Bot
parent 342872dafa
commit 25424ed47c
5 changed files with 72 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/react-native-example.yml vendored
View File

@@ -26,7 +26,7 @@ jobs:
run: | run: |
cd ios cd ios
IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") && echo $IPHONESIMULATOR IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") && echo $IPHONESIMULATOR
xcodebuild -workspace ReactNativeFlipperExample.xcworkspace -configuration Debug -scheme ReactNativeFlipperExample -sdk $IPHONESIMULATOR EXCLUDED_ARCHS=arm64 xcodebuild -workspace ReactNativeFlipperExample.xcworkspace -configuration Debug -scheme ReactNativeFlipperExample -sdk $IPHONESIMULATOR EXCLUDED_ARCHS="arm64 i386"
build-react-native-example-android: build-react-native-example-android:
runs-on: ubuntu-latest runs-on: ubuntu-latest

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

@@ -19,7 +19,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.87.0' }) use_flipper!({ 'Flipper' => '0.88.0', 'Flipper-Folly' => '2.6.7', 'Flipper-RSocket' => '1.4.3', 'Flipper-DoubleConversion' => '3.1.7', 'Flipper-Glog' => '0.3.9', 'Flipper-PeerTalk' => '0.0.4' })
post_install do |installer| post_install do |installer|
flipper_post_install(installer) flipper_post_install(installer)
# based on https://stackoverflow.com/a/37289688/1983583 # based on https://stackoverflow.com/a/37289688/1983583

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

@@ -10,61 +10,64 @@ PODS:
- React-Core (= 0.64.0) - React-Core (= 0.64.0)
- React-jsi (= 0.64.0) - React-jsi (= 0.64.0)
- ReactCommon/turbomodule/core (= 0.64.0) - ReactCommon/turbomodule/core (= 0.64.0)
- Flipper (0.87.0): - Flipper (0.88.0):
- Flipper-Folly (~> 2.5) - Flipper-Folly (~> 2.6)
- Flipper-RSocket (~> 1.3) - Flipper-RSocket (~> 1.4)
- Flipper-DoubleConversion (1.1.7) - Flipper-Boost-iOSX (1.76.0.1.10)
- Flipper-Folly (2.5.1): - Flipper-DoubleConversion (3.1.7)
- boost-for-react-native - Flipper-Fmt (7.1.7)
- Flipper-Folly (2.6.7):
- Flipper-Boost-iOSX
- Flipper-DoubleConversion - Flipper-DoubleConversion
- Flipper-Fmt (= 7.1.7)
- Flipper-Glog - Flipper-Glog
- libevent (~> 2.1.12) - libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.180) - OpenSSL-Universal (= 1.1.180)
- Flipper-Glog (0.3.6) - Flipper-Glog (0.3.9)
- Flipper-PeerTalk (0.0.4) - Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.3.0): - Flipper-RSocket (1.4.3):
- Flipper-Folly (~> 2.5) - Flipper-Folly (~> 2.6)
- FlipperKit (0.87.0): - FlipperKit (0.88.0):
- FlipperKit/Core (= 0.87.0) - FlipperKit/Core (= 0.88.0)
- FlipperKit/Core (0.87.0): - FlipperKit/Core (0.88.0):
- Flipper (~> 0.87.0) - Flipper (~> 0.88.0)
- FlipperKit/CppBridge - FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines - FlipperKit/FBDefines
- FlipperKit/FKPortForwarding - FlipperKit/FKPortForwarding
- FlipperKit/CppBridge (0.87.0): - FlipperKit/CppBridge (0.88.0):
- Flipper (~> 0.87.0) - Flipper (~> 0.88.0)
- FlipperKit/FBCxxFollyDynamicConvert (0.87.0): - FlipperKit/FBCxxFollyDynamicConvert (0.88.0):
- Flipper-Folly (~> 2.5) - Flipper-Folly (~> 2.6)
- FlipperKit/FBDefines (0.87.0) - FlipperKit/FBDefines (0.88.0)
- FlipperKit/FKPortForwarding (0.87.0): - FlipperKit/FKPortForwarding (0.88.0):
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4) - Flipper-PeerTalk (~> 0.0.4)
- FlipperKit/FlipperKitHighlightOverlay (0.87.0) - FlipperKit/FlipperKitHighlightOverlay (0.88.0)
- FlipperKit/FlipperKitLayoutHelpers (0.87.0): - FlipperKit/FlipperKitLayoutHelpers (0.88.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable - FlipperKit/FlipperKitLayoutTextSearchable
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.87.0): - FlipperKit/FlipperKitLayoutIOSDescriptors (0.88.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers - FlipperKit/FlipperKitLayoutHelpers
- YogaKit (~> 1.18) - YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutPlugin (0.87.0): - FlipperKit/FlipperKitLayoutPlugin (0.88.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers - FlipperKit/FlipperKitLayoutHelpers
- FlipperKit/FlipperKitLayoutIOSDescriptors - FlipperKit/FlipperKitLayoutIOSDescriptors
- FlipperKit/FlipperKitLayoutTextSearchable - FlipperKit/FlipperKitLayoutTextSearchable
- YogaKit (~> 1.18) - YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutTextSearchable (0.87.0) - FlipperKit/FlipperKitLayoutTextSearchable (0.88.0)
- FlipperKit/FlipperKitNetworkPlugin (0.87.0): - FlipperKit/FlipperKitNetworkPlugin (0.88.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitReactPlugin (0.87.0): - FlipperKit/FlipperKitReactPlugin (0.88.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitUserDefaultsPlugin (0.87.0): - FlipperKit/FlipperKitUserDefaultsPlugin (0.88.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/SKIOSNetworkPlugin (0.87.0): - FlipperKit/SKIOSNetworkPlugin (0.88.0):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin - FlipperKit/FlipperKitNetworkPlugin
- glog (0.3.5) - glog (0.3.5)
@@ -353,25 +356,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/React/FBReactNativeSpec`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- Flipper (= 0.87.0) - Flipper (= 0.88.0)
- Flipper-DoubleConversion (= 1.1.7) - Flipper-DoubleConversion (= 3.1.7)
- Flipper-Folly (~> 2.5) - Flipper-Folly (= 2.6.7)
- Flipper-Glog (= 0.3.6) - Flipper-Glog (= 0.3.9)
- Flipper-PeerTalk (~> 0.0.4) - Flipper-PeerTalk (= 0.0.4)
- Flipper-RSocket (~> 1.3) - Flipper-RSocket (= 1.4.3)
- FlipperKit (= 0.87.0) - FlipperKit (= 0.88.0)
- FlipperKit/Core (= 0.87.0) - FlipperKit/Core (= 0.88.0)
- FlipperKit/CppBridge (= 0.87.0) - FlipperKit/CppBridge (= 0.88.0)
- FlipperKit/FBCxxFollyDynamicConvert (= 0.87.0) - FlipperKit/FBCxxFollyDynamicConvert (= 0.88.0)
- FlipperKit/FBDefines (= 0.87.0) - FlipperKit/FBDefines (= 0.88.0)
- FlipperKit/FKPortForwarding (= 0.87.0) - FlipperKit/FKPortForwarding (= 0.88.0)
- FlipperKit/FlipperKitHighlightOverlay (= 0.87.0) - FlipperKit/FlipperKitHighlightOverlay (= 0.88.0)
- FlipperKit/FlipperKitLayoutPlugin (= 0.87.0) - FlipperKit/FlipperKitLayoutPlugin (= 0.88.0)
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.87.0) - FlipperKit/FlipperKitLayoutTextSearchable (= 0.88.0)
- FlipperKit/FlipperKitNetworkPlugin (= 0.87.0) - FlipperKit/FlipperKitNetworkPlugin (= 0.88.0)
- FlipperKit/FlipperKitReactPlugin (= 0.87.0) - FlipperKit/FlipperKitReactPlugin (= 0.88.0)
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.87.0) - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.88.0)
- FlipperKit/SKIOSNetworkPlugin (= 0.87.0) - FlipperKit/SKIOSNetworkPlugin (= 0.88.0)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- hermes-engine (~> 0.7.2) - hermes-engine (~> 0.7.2)
- libevent (~> 2.1.12) - libevent (~> 2.1.12)
@@ -409,7 +412,9 @@ SPEC REPOS:
- boost-for-react-native - boost-for-react-native
- CocoaAsyncSocket - CocoaAsyncSocket
- Flipper - Flipper
- Flipper-Boost-iOSX
- Flipper-DoubleConversion - Flipper-DoubleConversion
- Flipper-Fmt
- Flipper-Folly - Flipper-Folly
- Flipper-Glog - Flipper-Glog
- Flipper-PeerTalk - Flipper-PeerTalk
@@ -486,13 +491,15 @@ SPEC CHECKSUMS:
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5 FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5
FBReactNativeSpec: 9e9f783f0e063dba3464ba0f9a826ac6c7f2908f FBReactNativeSpec: 9e9f783f0e063dba3464ba0f9a826ac6c7f2908f
Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893 Flipper: bbba2bf26e3377be472c5afd4113a4c77c4af07a
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Boost-iOSX: df3765e7e26b44bc3e68a250ef1fa0afa15963bc
Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489 Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a
Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb FlipperKit: 44a312ebace6e44d98d078e044178bedd42ea0c8
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
@@ -524,6 +531,6 @@ SPEC CHECKSUMS:
Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
PODFILE CHECKSUM: 7428f5c59df17f0e7d381f659982cfd15b99db32 PODFILE CHECKSUM: cee409e92b36c593d6db3a47d25297d32e185581
COCOAPODS: 1.10.1 COCOAPODS: 1.10.1

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

@@ -400,11 +400,15 @@
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample/Pods-ReactNativeFlipperExample-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample/Pods-ReactNativeFlipperExample-frameworks.sh",
"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework", "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/glog/glog.framework/glog",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
); );
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@@ -464,11 +468,15 @@
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests-frameworks.sh",
"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework", "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/glog/glog.framework/glog",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
); );
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;

2
react-native/ReactNativeFlipperExample/package.json
View File

@@ -12,7 +12,7 @@
"dependencies": { "dependencies": {
"react": "^17.0.1", "react": "^17.0.1",
"react-native": "^0.64.0", "react-native": "^0.64.0",
"react-native-flipper": "^0.87.0" "react-native-flipper": "^0.88.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.14.0", "@babel/core": "^7.14.0",