Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Flipper #29787

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 60 additions & 60 deletions packages/rn-tester/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PODS:
- React-Core (= 1000.0.0)
- React-jsi (= 1000.0.0)
- ReactCommon/turbomodule/core (= 1000.0.0)
- Flipper (0.41.5):
- Flipper (0.54.0):
- Flipper-Folly (~> 2.2)
- Flipper-RSocket (~> 1.1)
- Flipper-DoubleConversion (1.1.7)
Expand All @@ -25,36 +25,36 @@ PODS:
- Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.1.0):
- Flipper-Folly (~> 2.2)
- FlipperKit (0.41.5):
- FlipperKit/Core (= 0.41.5)
- FlipperKit/Core (0.41.5):
- Flipper (~> 0.41.5)
- FlipperKit (0.54.0):
- FlipperKit/Core (= 0.54.0)
- FlipperKit/Core (0.54.0):
- Flipper (~> 0.54.0)
- FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines
- FlipperKit/FKPortForwarding
- FlipperKit/CppBridge (0.41.5):
- Flipper (~> 0.41.5)
- FlipperKit/FBCxxFollyDynamicConvert (0.41.5):
- FlipperKit/CppBridge (0.54.0):
- Flipper (~> 0.54.0)
- FlipperKit/FBCxxFollyDynamicConvert (0.54.0):
- Flipper-Folly (~> 2.2)
- FlipperKit/FBDefines (0.41.5)
- FlipperKit/FKPortForwarding (0.41.5):
- FlipperKit/FBDefines (0.54.0)
- FlipperKit/FKPortForwarding (0.54.0):
- CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4)
- FlipperKit/FlipperKitHighlightOverlay (0.41.5)
- FlipperKit/FlipperKitLayoutPlugin (0.41.5):
- FlipperKit/FlipperKitHighlightOverlay (0.54.0)
- FlipperKit/FlipperKitLayoutPlugin (0.54.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable
- YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutTextSearchable (0.41.5)
- FlipperKit/FlipperKitNetworkPlugin (0.41.5):
- FlipperKit/FlipperKitLayoutTextSearchable (0.54.0)
- FlipperKit/FlipperKitNetworkPlugin (0.54.0):
- FlipperKit/Core
- FlipperKit/FlipperKitReactPlugin (0.41.5):
- FlipperKit/FlipperKitReactPlugin (0.54.0):
- FlipperKit/Core
- FlipperKit/FlipperKitUserDefaultsPlugin (0.41.5):
- FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0):
- FlipperKit/Core
- FlipperKit/SKIOSNetworkPlugin (0.41.5):
- FlipperKit/SKIOSNetworkPlugin (0.54.0):
- FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin
- glog (0.3.5)
Expand Down Expand Up @@ -357,25 +357,25 @@ DEPENDENCIES:
- DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../../Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../../Libraries/FBReactNativeSpec`)
- Flipper (~> 0.41.1)
- Flipper (~> 0.54.0)
- Flipper-DoubleConversion (= 1.1.7)
- Flipper-Folly (~> 2.2)
- Flipper-Glog (= 0.3.6)
- Flipper-PeerTalk (~> 0.0.4)
- Flipper-RSocket (~> 1.1)
- FlipperKit (~> 0.41.1)
- FlipperKit/Core (~> 0.41.1)
- FlipperKit/CppBridge (~> 0.41.1)
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.41.1)
- FlipperKit/FBDefines (~> 0.41.1)
- FlipperKit/FKPortForwarding (~> 0.41.1)
- FlipperKit/FlipperKitHighlightOverlay (~> 0.41.1)
- FlipperKit/FlipperKitLayoutPlugin (~> 0.41.1)
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.41.1)
- FlipperKit/FlipperKitNetworkPlugin (~> 0.41.1)
- FlipperKit/FlipperKitReactPlugin (~> 0.41.1)
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.41.1)
- FlipperKit/SKIOSNetworkPlugin (~> 0.41.1)
- FlipperKit (~> 0.54.0)
- FlipperKit/Core (~> 0.54.0)
- FlipperKit/CppBridge (~> 0.54.0)
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0)
- FlipperKit/FBDefines (~> 0.54.0)
- FlipperKit/FKPortForwarding (~> 0.54.0)
- FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0)
- FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0)
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0)
- FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0)
- FlipperKit/FlipperKitReactPlugin (~> 0.54.0)
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0)
- FlipperKit/SKIOSNetworkPlugin (~> 0.54.0)
- glog (from `../../third-party-podspecs/glog.podspec`)
- RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../../Libraries/RCTRequired`)
Expand Down Expand Up @@ -489,43 +489,43 @@ SPEC CHECKSUMS:
CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
DoubleConversion: cde416483dac037923206447da6e1454df403714
FBLazyVector: 8ea0285646adaf7fa725c20ed737c49ee5ea680a
FBReactNativeSpec: 29b1b8a11346e71351f3a2ba126439810edee362
Flipper: 33585e2d9810fe5528346be33bcf71b37bb7ae13
FBLazyVector: ecce53eaeb819d20986d324ac55fff597ab98667
FBReactNativeSpec: 3afee962d5c200d4284cb1ff6816f9a0a120a5eb
Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
FlipperKit: bc68102cd4952a258a23c9c1b316c7bec1fecf83
FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
RCT-Folly: b39288cedafe50da43317ec7d91bcc8cc0abbf33
RCTRequired: 34582e9b3ebe69f244e091f37218d318406d5c4a
RCTTypeSafety: 84db212a990ce622a28f1bcb1ac68c658e722373
React: cafb3c2321f7df55ce90dbf29d513799a79e4418
React-callinvoker: 0dada022d38b73e6e15b33e2a96476153f79bbf6
React-Core: d377a770bb13aa5120a6ce553f75f0e1cbc1aafe
React-CoreModules: f38b671f8df4c1c744ed69f00264539a7c4024b4
React-cxxreact: de6de17eac6bbaa4f9fad46b66e7f0c4aaaf863d
React-jsi: 652ad7cb7ff8c87e0e9fb11e9ebcbbc70cdfe865
React-jsiexecutor: f20d2b5986dbe3d0e94ccbf2d8da24e0d9c42cc9
React-jsinspector: 7fbf9b42b58b02943a0d89b0ba9fff0070f2de98
React-perflogger: 1f668f3e4d1adef1fafb3b95e7d6cf922113fe31
React-RCTActionSheet: 51c43beeb74ef41189e87fe9823e53ebf6210359
React-RCTAnimation: 62f271148b71d0200773b4959e99a80f624182d4
React-RCTBlob: b81d69c4dc7f7891a6a3ec969bba9b0a9801b062
React-RCTImage: 37646ebc761e9f68781867e9e802afdadd18a3dc
React-RCTLinking: b5c261eb3befe7d5c62a4706ae904943e73f9c82
React-RCTNetwork: 2f6c4ba283c9c2ea768fecc6c681d3ab9448b5f5
React-RCTPushNotification: a4f86ef3d7c0cb3ee570108a62e39fcd296a5030
React-RCTSettings: 5a76683d9cf7408b5f8c3306cda3eaf4db191fce
React-RCTTest: 090e9816044220c39462be109dab6d473d94b1c9
React-RCTText: 6c01963d3e562109f5548262b09b1b2bc260dd60
React-RCTVibration: 0997fcaf753c7ac0a341177db120eebc438484cf
React-runtimeexecutor: 60dd6204a13f68a1aa1118870edcc604a791df2b
ReactCommon: 1f231b4fbed866032aa084ca23973063bbb51927
Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae
RCTRequired: 053408781ef1bd7efac35859311d691411d3d75a
RCTTypeSafety: e60b1e7b3a77c60eb48cb4f63ad6d6f3672723bb
React: 012bfe513af6222c396037f1645f74facb9f4f4a
React-callinvoker: 2e4abb97516fd06780d36ebede09c10139f24894
React-Core: 009c3b7557af5945d9755134b85999e000af0fbf
React-CoreModules: 6abb48f40411b144f7318b875f05c8ae9328fce0
React-cxxreact: 6f9820faf0bca07349949c13c417e93105139db8
React-jsi: d1dcd125629f55b9d6792ac24c0a51e8bcb2d93a
React-jsiexecutor: 47d77cf1a87c4126b25b363a70345ee55143e3e9
React-jsinspector: 939135a10279aa988c60fbb06f15d342aa3f41c7
React-perflogger: 0bcdd12036100381479417a82f51eeca4b6cafc5
React-RCTActionSheet: 08b87076ec2c9275f58cb41dbaa3e7929d33a8a9
React-RCTAnimation: 0f388bc43ef0a3640bc7523ecde383838884fc56
React-RCTBlob: 8340aa7f183611e0666583fd20242fe73bd29ccc
React-RCTImage: 9c31c49820da405c09b202f917ca5faef5a73df9
React-RCTLinking: ffd0955f4d02bc7d900b69ef87bbf7ffac26a784
React-RCTNetwork: 1902fd373342135d67776f3f2d3bc0f5426483b7
React-RCTPushNotification: 12af30441c02aad26b212af4c7ebab82056c041f
React-RCTSettings: 56822e3d8560b9f6409c4ec3d3f03d9657be0847
React-RCTTest: 7b6150cb3a3709af7524ad959fbcf74905d87a71
React-RCTText: 7e0500014272cce025e007dcca8f654947fd8df9
React-RCTVibration: beb57a3a8eaf5c6450b26b70b4fe60bcca8f1d55
React-runtimeexecutor: 6780a6f99437c1b61487fc154e99690f29ee54e0
ReactCommon: 32d4a3f6c8c08ba4f4b2a3759bcbe62106cf51a1
Yoga: 8c425b877f9156a86fca64fd56b49edb91eb42bb
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 3045d3456f0f2268f15db9a527839e6a19e6071c
Expand Down
4 changes: 2 additions & 2 deletions packages/rn-tester/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Before running the app, make sure you ran:
### Running on iOS

Both macOS and Xcode are required.

- `cd packages/rn-tester`
- Install [Bundler](https://bundler.io/): `gem install bundler`. We use bundler to install the right version of [CocoaPods](https://cocoapods.org/) locally.
- Install Bundler and CocoaPods dependencies: `bundle install && bundle exec pod install`
- Open the generated `RNTesterPods.xcworkspace`. This is not checked in, as it is generated by CocoaPods. Do not open `RNTesterPods.xcodeproj` directly.
Expand All @@ -25,7 +25,7 @@ You'll need to have all the [prerequisites](https://github.com/facebook/react-na
Start an Android emulator.

cd react-native
./gradlew :RNTester:android:app:installJscDebug
./gradlew :packages:rn-tester:android:app:installJscDebug
./scripts/packager.sh

_Note: Building for the first time can take a while._
Expand Down
2 changes: 1 addition & 1 deletion packages/rn-tester/android/app/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ android.useAndroidX=true
android.enableJetifier=true

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.37.0
FLIPPER_VERSION=0.54.0
2 changes: 1 addition & 1 deletion scripts/react_native_pods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def use_react_native! (options={})
end

def use_flipper!(versions = {}, configurations: ['Debug'])
versions['Flipper'] ||= '~> 0.41.1'
versions['Flipper'] ||= '~> 0.54.0'
versions['Flipper-DoubleConversion'] ||= '1.1.7'
versions['Flipper-Folly'] ||= '~> 2.2'
versions['Flipper-Glog'] ||= '0.3.6'
Expand Down
2 changes: 1 addition & 1 deletion template/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ android.useAndroidX=true
android.enableJetifier=true

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.37.0
FLIPPER_VERSION=0.54.0