diff --git a/.github/workflows/react-native-example.yml b/.github/workflows/react-native-example.yml index 1b281d574..cb894a338 100644 --- a/.github/workflows/react-native-example.yml +++ b/.github/workflows/react-native-example.yml @@ -26,7 +26,7 @@ jobs: run: | cd ios 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: runs-on: ubuntu-latest diff --git a/react-native/ReactNativeFlipperExample/ios/Podfile b/react-native/ReactNativeFlipperExample/ios/Podfile index d5e23ca0b..ab384f475 100644 --- a/react-native/ReactNativeFlipperExample/ios/Podfile +++ b/react-native/ReactNativeFlipperExample/ios/Podfile @@ -19,7 +19,7 @@ target 'ReactNativeFlipperExample' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # 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| flipper_post_install(installer) # based on https://stackoverflow.com/a/37289688/1983583 diff --git a/react-native/ReactNativeFlipperExample/ios/Podfile.lock b/react-native/ReactNativeFlipperExample/ios/Podfile.lock index 61828ab7e..154d9d4ff 100644 --- a/react-native/ReactNativeFlipperExample/ios/Podfile.lock +++ b/react-native/ReactNativeFlipperExample/ios/Podfile.lock @@ -10,61 +10,64 @@ PODS: - React-Core (= 0.64.0) - React-jsi (= 0.64.0) - ReactCommon/turbomodule/core (= 0.64.0) - - Flipper (0.87.0): - - Flipper-Folly (~> 2.5) - - Flipper-RSocket (~> 1.3) - - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.5.1): - - boost-for-react-native + - Flipper (0.88.0): + - Flipper-Folly (~> 2.6) + - Flipper-RSocket (~> 1.4) + - Flipper-Boost-iOSX (1.76.0.1.10) + - Flipper-DoubleConversion (3.1.7) + - Flipper-Fmt (7.1.7) + - Flipper-Folly (2.6.7): + - Flipper-Boost-iOSX - Flipper-DoubleConversion + - Flipper-Fmt (= 7.1.7) - Flipper-Glog - libevent (~> 2.1.12) - OpenSSL-Universal (= 1.1.180) - - Flipper-Glog (0.3.6) + - Flipper-Glog (0.3.9) - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.3.0): - - Flipper-Folly (~> 2.5) - - FlipperKit (0.87.0): - - FlipperKit/Core (= 0.87.0) - - FlipperKit/Core (0.87.0): - - Flipper (~> 0.87.0) + - Flipper-RSocket (1.4.3): + - Flipper-Folly (~> 2.6) + - FlipperKit (0.88.0): + - FlipperKit/Core (= 0.88.0) + - FlipperKit/Core (0.88.0): + - Flipper (~> 0.88.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.87.0): - - Flipper (~> 0.87.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.87.0): - - Flipper-Folly (~> 2.5) - - FlipperKit/FBDefines (0.87.0) - - FlipperKit/FKPortForwarding (0.87.0): + - FlipperKit/CppBridge (0.88.0): + - Flipper (~> 0.88.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.88.0): + - Flipper-Folly (~> 2.6) + - FlipperKit/FBDefines (0.88.0) + - FlipperKit/FKPortForwarding (0.88.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.87.0) - - FlipperKit/FlipperKitLayoutHelpers (0.87.0): + - FlipperKit/FlipperKitHighlightOverlay (0.88.0) + - FlipperKit/FlipperKitLayoutHelpers (0.88.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.87.0): + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.88.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.87.0): + - FlipperKit/FlipperKitLayoutPlugin (0.88.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - FlipperKit/FlipperKitLayoutIOSDescriptors - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.87.0) - - FlipperKit/FlipperKitNetworkPlugin (0.87.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.88.0) + - FlipperKit/FlipperKitNetworkPlugin (0.88.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.87.0): + - FlipperKit/FlipperKitReactPlugin (0.88.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.87.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.88.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.87.0): + - FlipperKit/SKIOSNetworkPlugin (0.88.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - glog (0.3.5) @@ -353,25 +356,25 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - - Flipper (= 0.87.0) - - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.5) - - Flipper-Glog (= 0.3.6) - - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.3) - - FlipperKit (= 0.87.0) - - FlipperKit/Core (= 0.87.0) - - FlipperKit/CppBridge (= 0.87.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.87.0) - - FlipperKit/FBDefines (= 0.87.0) - - FlipperKit/FKPortForwarding (= 0.87.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.87.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.87.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.87.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.87.0) - - FlipperKit/FlipperKitReactPlugin (= 0.87.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.87.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.87.0) + - Flipper (= 0.88.0) + - Flipper-DoubleConversion (= 3.1.7) + - Flipper-Folly (= 2.6.7) + - Flipper-Glog (= 0.3.9) + - Flipper-PeerTalk (= 0.0.4) + - Flipper-RSocket (= 1.4.3) + - FlipperKit (= 0.88.0) + - FlipperKit/Core (= 0.88.0) + - FlipperKit/CppBridge (= 0.88.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.88.0) + - FlipperKit/FBDefines (= 0.88.0) + - FlipperKit/FKPortForwarding (= 0.88.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.88.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.88.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.88.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.88.0) + - FlipperKit/FlipperKitReactPlugin (= 0.88.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.88.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.88.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - hermes-engine (~> 0.7.2) - libevent (~> 2.1.12) @@ -409,7 +412,9 @@ SPEC REPOS: - boost-for-react-native - CocoaAsyncSocket - Flipper + - Flipper-Boost-iOSX - Flipper-DoubleConversion + - Flipper-Fmt - Flipper-Folly - Flipper-Glog - Flipper-PeerTalk @@ -486,13 +491,15 @@ SPEC CHECKSUMS: DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5 FBReactNativeSpec: 9e9f783f0e063dba3464ba0f9a826ac6c7f2908f - Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893 - Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489 - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 + Flipper: bbba2bf26e3377be472c5afd4113a4c77c4af07a + Flipper-Boost-iOSX: df3765e7e26b44bc3e68a250ef1fa0afa15963bc + Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a + Flipper-Glog: 05579840e2750ec907ee2f81544f41ad76a7cae4 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5 - FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb + Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 + FlipperKit: 44a312ebace6e44d98d078e044178bedd42ea0c8 glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 @@ -524,6 +531,6 @@ SPEC CHECKSUMS: Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 7428f5c59df17f0e7d381f659982cfd15b99db32 +PODFILE CHECKSUM: cee409e92b36c593d6db3a47d25297d32e185581 COCOAPODS: 1.10.1 diff --git a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj index bba3bf66d..84d0cfe04 100644 --- a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj +++ b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj @@ -400,11 +400,15 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample/Pods-ReactNativeFlipperExample-frameworks.sh", "${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", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${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", ); runOnlyForDeploymentPostprocessing = 0; @@ -464,11 +468,15 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests-frameworks.sh", "${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", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${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", ); runOnlyForDeploymentPostprocessing = 0; diff --git a/react-native/ReactNativeFlipperExample/package.json b/react-native/ReactNativeFlipperExample/package.json index af90c5012..6342d2972 100644 --- a/react-native/ReactNativeFlipperExample/package.json +++ b/react-native/ReactNativeFlipperExample/package.json @@ -12,7 +12,7 @@ "dependencies": { "react": "^17.0.1", "react-native": "^0.64.0", - "react-native-flipper": "^0.87.0" + "react-native-flipper": "^0.88.0" }, "devDependencies": { "@babel/core": "^7.14.0",