Skip to content

Commit d8b70b1

Browse files
mweststratefacebook-github-bot
mweststrate
authored and
facebook-github-bot
committed
Update Flipper (#29787)
Summary: The current Flipper version included in new React Native is quite old, causing some bugs to be present which have long been solved, such as freezing the UI after inspecting it. Fixes This fixes #29492 / facebook/flipper#1399 ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see: https://github.com/facebook/react-native/wiki/Changelog --> [general][changed] - Update Flipper to 0.54 Pull Request resolved: #29787 Test Plan: Updated the RN 0.63.2 based test project https://github.com/mweststrate/flipper-issue-1399-repo with `use_flipper!('Flipper' => '0.54.0')` (in `ios/Podspec`) / `FLIPPER_VERSION=0.52.1` in `gradle.properties` in the test project https://github.com/mweststrate/flipper-issue-1399-repo and verified that everything builds and connects correctly, and that the bug is no longer present. Tried to run RN-tester project in this repo. For iOS this succeeded, on Android I got a build error: ``` make: Leaving directory '/Users/mweststrate/Desktop/react-native/ReactAndroid/src/main/jni/react/jni' make: Entering directory '/Users/mweststrate/Desktop/react-native/ReactAndroid/src/main/jni/react/jni' fcntl(): Bad file descriptor [armeabi-v7a] Compile++ thumb: folly_json <= FileUtil.cpp /Users/mweststrate/Desktop/react-native/ReactAndroid/build/third-party-ndk/folly/folly/FileUtil.cpp:37:14: error: no matching function for call to 'wrapNoInt' make: Leaving directory '/Users/mweststrate/Desktop/react-native/ReactAndroid/src/main/jni/react/jni' return int(wrapNoInt(open, name, flags, mode)); ^~~~~~~~~ /Users/mweststrate/Desktop/react-native/ReactAndroid/build/third-party-ndk/folly/folly/detail/FileUtilDetail.h:34:9: note: candidate template ignored: couldn't infer template argument 'F' ssize_t wrapNoInt(F f, Args... args) { ^ 1 error generated. make: *** [/opt/android_sdk/ndk/21.3.6528147/build/core/build-binary.mk:478: /Users/mweststrate/Desktop/react-native/ReactAndroid/build/tmp/buildReactNdkLib/local/armeabi-v7a/objs/folly_json/folly/FileUtil.o] Error 1 make: *** Waiting for unfinished jobs.... fcntl(): Bad file descriptor make: Entering directory '/Users/mweststrate/Desktop/react-native/ReactAndroid/src/main/jni/react/jni' [armeabi-v7a] Compile++ thumb: folly_json <= Demangle.cpp ``` No idea if it is related. I guess not since without making the change I got the same error. Reviewed By: mweststrate Differential Revision: D23767388 Pulled By: fkgozali fbshipit-source-id: 35f0d3ddec41942f5bbc96cb391975d84729ef5e
1 parent 22804a6 commit d8b70b1

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎packages/rn-tester/Podfile.lock

+33-33
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PODS:
1111
- React-Core (= 1000.0.0)
1212
- React-jsi (= 1000.0.0)
1313
- ReactCommon/turbomodule/core (= 1000.0.0)
14-
- Flipper (0.41.5):
14+
- Flipper (0.54.0):
1515
- Flipper-Folly (~> 2.2)
1616
- Flipper-RSocket (~> 1.1)
1717
- Flipper-DoubleConversion (1.1.7)
@@ -25,36 +25,36 @@ PODS:
2525
- Flipper-PeerTalk (0.0.4)
2626
- Flipper-RSocket (1.1.0):
2727
- Flipper-Folly (~> 2.2)
28-
- FlipperKit (0.41.5):
29-
- FlipperKit/Core (= 0.41.5)
30-
- FlipperKit/Core (0.41.5):
31-
- Flipper (~> 0.41.5)
28+
- FlipperKit (0.54.0):
29+
- FlipperKit/Core (= 0.54.0)
30+
- FlipperKit/Core (0.54.0):
31+
- Flipper (~> 0.54.0)
3232
- FlipperKit/CppBridge
3333
- FlipperKit/FBCxxFollyDynamicConvert
3434
- FlipperKit/FBDefines
3535
- FlipperKit/FKPortForwarding
36-
- FlipperKit/CppBridge (0.41.5):
37-
- Flipper (~> 0.41.5)
38-
- FlipperKit/FBCxxFollyDynamicConvert (0.41.5):
36+
- FlipperKit/CppBridge (0.54.0):
37+
- Flipper (~> 0.54.0)
38+
- FlipperKit/FBCxxFollyDynamicConvert (0.54.0):
3939
- Flipper-Folly (~> 2.2)
40-
- FlipperKit/FBDefines (0.41.5)
41-
- FlipperKit/FKPortForwarding (0.41.5):
40+
- FlipperKit/FBDefines (0.54.0)
41+
- FlipperKit/FKPortForwarding (0.54.0):
4242
- CocoaAsyncSocket (~> 7.6)
4343
- Flipper-PeerTalk (~> 0.0.4)
44-
- FlipperKit/FlipperKitHighlightOverlay (0.41.5)
45-
- FlipperKit/FlipperKitLayoutPlugin (0.41.5):
44+
- FlipperKit/FlipperKitHighlightOverlay (0.54.0)
45+
- FlipperKit/FlipperKitLayoutPlugin (0.54.0):
4646
- FlipperKit/Core
4747
- FlipperKit/FlipperKitHighlightOverlay
4848
- FlipperKit/FlipperKitLayoutTextSearchable
4949
- YogaKit (~> 1.18)
50-
- FlipperKit/FlipperKitLayoutTextSearchable (0.41.5)
51-
- FlipperKit/FlipperKitNetworkPlugin (0.41.5):
50+
- FlipperKit/FlipperKitLayoutTextSearchable (0.54.0)
51+
- FlipperKit/FlipperKitNetworkPlugin (0.54.0):
5252
- FlipperKit/Core
53-
- FlipperKit/FlipperKitReactPlugin (0.41.5):
53+
- FlipperKit/FlipperKitReactPlugin (0.54.0):
5454
- FlipperKit/Core
55-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.41.5):
55+
- FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0):
5656
- FlipperKit/Core
57-
- FlipperKit/SKIOSNetworkPlugin (0.41.5):
57+
- FlipperKit/SKIOSNetworkPlugin (0.54.0):
5858
- FlipperKit/Core
5959
- FlipperKit/FlipperKitNetworkPlugin
6060
- glog (0.3.5)
@@ -357,25 +357,25 @@ DEPENDENCIES:
357357
- DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
358358
- FBLazyVector (from `../../Libraries/FBLazyVector`)
359359
- FBReactNativeSpec (from `../../Libraries/FBReactNativeSpec`)
360-
- Flipper (~> 0.41.1)
360+
- Flipper (~> 0.54.0)
361361
- Flipper-DoubleConversion (= 1.1.7)
362362
- Flipper-Folly (~> 2.2)
363363
- Flipper-Glog (= 0.3.6)
364364
- Flipper-PeerTalk (~> 0.0.4)
365365
- Flipper-RSocket (~> 1.1)
366-
- FlipperKit (~> 0.41.1)
367-
- FlipperKit/Core (~> 0.41.1)
368-
- FlipperKit/CppBridge (~> 0.41.1)
369-
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.41.1)
370-
- FlipperKit/FBDefines (~> 0.41.1)
371-
- FlipperKit/FKPortForwarding (~> 0.41.1)
372-
- FlipperKit/FlipperKitHighlightOverlay (~> 0.41.1)
373-
- FlipperKit/FlipperKitLayoutPlugin (~> 0.41.1)
374-
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.41.1)
375-
- FlipperKit/FlipperKitNetworkPlugin (~> 0.41.1)
376-
- FlipperKit/FlipperKitReactPlugin (~> 0.41.1)
377-
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.41.1)
378-
- FlipperKit/SKIOSNetworkPlugin (~> 0.41.1)
366+
- FlipperKit (~> 0.54.0)
367+
- FlipperKit/Core (~> 0.54.0)
368+
- FlipperKit/CppBridge (~> 0.54.0)
369+
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0)
370+
- FlipperKit/FBDefines (~> 0.54.0)
371+
- FlipperKit/FKPortForwarding (~> 0.54.0)
372+
- FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0)
373+
- FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0)
374+
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0)
375+
- FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0)
376+
- FlipperKit/FlipperKitReactPlugin (~> 0.54.0)
377+
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0)
378+
- FlipperKit/SKIOSNetworkPlugin (~> 0.54.0)
379379
- glog (from `../../third-party-podspecs/glog.podspec`)
380380
- RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
381381
- RCTRequired (from `../../Libraries/RCTRequired`)
@@ -491,13 +491,13 @@ SPEC CHECKSUMS:
491491
DoubleConversion: cde416483dac037923206447da6e1454df403714
492492
FBLazyVector: 8ea0285646adaf7fa725c20ed737c49ee5ea680a
493493
FBReactNativeSpec: 29b1b8a11346e71351f3a2ba126439810edee362
494-
Flipper: 33585e2d9810fe5528346be33bcf71b37bb7ae13
494+
Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
495495
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
496496
Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
497497
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
498498
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
499499
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
500-
FlipperKit: bc68102cd4952a258a23c9c1b316c7bec1fecf83
500+
FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
501501
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
502502
OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
503503
RCT-Folly: b39288cedafe50da43317ec7d91bcc8cc0abbf33

‎packages/rn-tester/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Before running the app, make sure you ran:
1313
### Running on iOS
1414

1515
Both macOS and Xcode are required.
16-
16+
- `cd packages/rn-tester`
1717
- Install [Bundler](https://bundler.io/): `gem install bundler`. We use bundler to install the right version of [CocoaPods](https://cocoapods.org/) locally.
1818
- Install Bundler and CocoaPods dependencies: `bundle install && bundle exec pod install`
1919
- Open the generated `RNTesterPods.xcworkspace`. This is not checked in, as it is generated by CocoaPods. Do not open `RNTesterPods.xcodeproj` directly.

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

+1-1
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.37.0
13+
FLIPPER_VERSION=0.54.0

‎scripts/react_native_pods.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def use_react_native! (options={})
7070
end
7171

7272
def use_flipper!(versions = {}, configurations: ['Debug'])
73-
versions['Flipper'] ||= '~> 0.41.1'
73+
versions['Flipper'] ||= '~> 0.54.0'
7474
versions['Flipper-DoubleConversion'] ||= '1.1.7'
7575
versions['Flipper-Folly'] ||= '~> 2.2'
7676
versions['Flipper-Glog'] ||= '0.3.6'

‎template/android/gradle.properties

+1-1
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.37.0
28+
FLIPPER_VERSION=0.54.0

0 commit comments

Comments
 (0)