Skip to content

Commit 17f025b

Browse files
sunnylqmfacebook-github-bot
sunnylqm
authored and
facebook-github-bot
committed
Upgrade Flipper to 0.37.0 (#28545)
Summary: Bump flipper to 0.37 for both iOS and Android ## Changelog [Android] [Changed] - Upgrade Flipper to 0.37.0 [iOS] [Changed] - Upgrade Flipper to 0.37.0 Pull Request resolved: #28545 Test Plan: RNTester build pass Reviewed By: rickhanlonii Differential Revision: D20930069 Pulled By: hramos fbshipit-source-id: a7cb719da3e51e6a42d27d5e64bc664398d0d3c5
1 parent 19658a1 commit 17f025b

File tree

5 files changed

+90
-51
lines changed

5 files changed

+90
-51
lines changed

‎RNTester/Podfile.lock

+44-44
Original file line numberDiff line numberDiff line change
@@ -11,50 +11,50 @@ PODS:
1111
- React-Core (= 1000.0.0)
1212
- React-jsi (= 1000.0.0)
1313
- ReactCommon/turbomodule/core (= 1000.0.0)
14-
- Flipper (0.33.1):
15-
- Flipper-Folly (~> 2.1)
16-
- Flipper-RSocket (~> 1.0)
14+
- Flipper (0.37.0):
15+
- Flipper-Folly (~> 2.2)
16+
- Flipper-RSocket (~> 1.1)
1717
- Flipper-DoubleConversion (1.1.7)
18-
- Flipper-Folly (2.1.1):
18+
- Flipper-Folly (2.2.0):
1919
- boost-for-react-native
2020
- CocoaLibEvent (~> 1.0)
2121
- Flipper-DoubleConversion
2222
- Flipper-Glog
2323
- OpenSSL-Universal (= 1.0.2.19)
2424
- Flipper-Glog (0.3.6)
2525
- Flipper-PeerTalk (0.0.4)
26-
- Flipper-RSocket (1.0.0):
27-
- Flipper-Folly (~> 2.0)
28-
- FlipperKit (0.33.1):
29-
- FlipperKit/Core (= 0.33.1)
30-
- FlipperKit/Core (0.33.1):
31-
- Flipper (~> 0.33.1)
26+
- Flipper-RSocket (1.1.0):
27+
- Flipper-Folly (~> 2.2)
28+
- FlipperKit (0.37.0):
29+
- FlipperKit/Core (= 0.37.0)
30+
- FlipperKit/Core (0.37.0):
31+
- Flipper (~> 0.37.0)
3232
- FlipperKit/CppBridge
3333
- FlipperKit/FBCxxFollyDynamicConvert
3434
- FlipperKit/FBDefines
3535
- FlipperKit/FKPortForwarding
36-
- FlipperKit/CppBridge (0.33.1):
37-
- Flipper (~> 0.33.1)
38-
- FlipperKit/FBCxxFollyDynamicConvert (0.33.1):
39-
- Flipper-Folly (~> 2.1)
40-
- FlipperKit/FBDefines (0.33.1)
41-
- FlipperKit/FKPortForwarding (0.33.1):
36+
- FlipperKit/CppBridge (0.37.0):
37+
- Flipper (~> 0.37.0)
38+
- FlipperKit/FBCxxFollyDynamicConvert (0.37.0):
39+
- Flipper-Folly (~> 2.2)
40+
- FlipperKit/FBDefines (0.37.0)
41+
- FlipperKit/FKPortForwarding (0.37.0):
4242
- CocoaAsyncSocket (~> 7.6)
4343
- Flipper-PeerTalk (~> 0.0.4)
44-
- FlipperKit/FlipperKitHighlightOverlay (0.33.1)
45-
- FlipperKit/FlipperKitLayoutPlugin (0.33.1):
44+
- FlipperKit/FlipperKitHighlightOverlay (0.37.0)
45+
- FlipperKit/FlipperKitLayoutPlugin (0.37.0):
4646
- FlipperKit/Core
4747
- FlipperKit/FlipperKitHighlightOverlay
4848
- FlipperKit/FlipperKitLayoutTextSearchable
4949
- YogaKit (~> 1.18)
50-
- FlipperKit/FlipperKitLayoutTextSearchable (0.33.1)
51-
- FlipperKit/FlipperKitNetworkPlugin (0.33.1):
50+
- FlipperKit/FlipperKitLayoutTextSearchable (0.37.0)
51+
- FlipperKit/FlipperKitNetworkPlugin (0.37.0):
5252
- FlipperKit/Core
53-
- FlipperKit/FlipperKitReactPlugin (0.33.1):
53+
- FlipperKit/FlipperKitReactPlugin (0.37.0):
5454
- FlipperKit/Core
55-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.33.1):
55+
- FlipperKit/FlipperKitUserDefaultsPlugin (0.37.0):
5656
- FlipperKit/Core
57-
- FlipperKit/SKIOSNetworkPlugin (0.33.1):
57+
- FlipperKit/SKIOSNetworkPlugin (0.37.0):
5858
- FlipperKit/Core
5959
- FlipperKit/FlipperKitNetworkPlugin
6060
- Folly (2020.01.13.00):
@@ -343,25 +343,25 @@ DEPENDENCIES:
343343
- DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`)
344344
- FBLazyVector (from `../Libraries/FBLazyVector`)
345345
- FBReactNativeSpec (from `../Libraries/FBReactNativeSpec`)
346-
- Flipper (~> 0.33.1)
346+
- Flipper (~> 0.37.0)
347347
- Flipper-DoubleConversion (= 1.1.7)
348-
- Flipper-Folly (~> 2.1)
348+
- Flipper-Folly (~> 2.2)
349349
- Flipper-Glog (= 0.3.6)
350350
- Flipper-PeerTalk (~> 0.0.4)
351-
- Flipper-RSocket (~> 1.0)
352-
- FlipperKit (~> 0.33.1)
353-
- FlipperKit/Core (~> 0.33.1)
354-
- FlipperKit/CppBridge (~> 0.33.1)
355-
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.33.1)
356-
- FlipperKit/FBDefines (~> 0.33.1)
357-
- FlipperKit/FKPortForwarding (~> 0.33.1)
358-
- FlipperKit/FlipperKitHighlightOverlay (~> 0.33.1)
359-
- FlipperKit/FlipperKitLayoutPlugin (~> 0.33.1)
360-
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.33.1)
361-
- FlipperKit/FlipperKitNetworkPlugin (~> 0.33.1)
362-
- FlipperKit/FlipperKitReactPlugin (~> 0.33.1)
363-
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.33.1)
364-
- FlipperKit/SKIOSNetworkPlugin (~> 0.33.1)
351+
- Flipper-RSocket (~> 1.1)
352+
- FlipperKit (~> 0.37.0)
353+
- FlipperKit/Core (~> 0.37.0)
354+
- FlipperKit/CppBridge (~> 0.37.0)
355+
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.37.0)
356+
- FlipperKit/FBDefines (~> 0.37.0)
357+
- FlipperKit/FKPortForwarding (~> 0.37.0)
358+
- FlipperKit/FlipperKitHighlightOverlay (~> 0.37.0)
359+
- FlipperKit/FlipperKitLayoutPlugin (~> 0.37.0)
360+
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.37.0)
361+
- FlipperKit/FlipperKitNetworkPlugin (~> 0.37.0)
362+
- FlipperKit/FlipperKitReactPlugin (~> 0.37.0)
363+
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.37.0)
364+
- FlipperKit/SKIOSNetworkPlugin (~> 0.37.0)
365365
- Folly (from `../third-party-podspecs/Folly.podspec`)
366366
- glog (from `../third-party-podspecs/glog.podspec`)
367367
- RCTRequired (from `../Libraries/RCTRequired`)
@@ -474,13 +474,13 @@ SPEC CHECKSUMS:
474474
DoubleConversion: cde416483dac037923206447da6e1454df403714
475475
FBLazyVector: 8ea0285646adaf7fa725c20ed737c49ee5ea680a
476476
FBReactNativeSpec: e8f07c749b9cf184c819f5a8ca44b91ab61fca12
477-
Flipper: 6c1f484f9a88d30ab3e272800d53688439e50f69
477+
Flipper: 1670db365568191bd123a0c905b834e77ba9e3d3
478478
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
479-
Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162
479+
Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
480480
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
481481
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
482-
Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371
483-
FlipperKit: 6dc9b8f4ef60d9e5ded7f0264db299c91f18832e
482+
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
483+
FlipperKit: afd4259ef9eadeeb2d30250b37d95cb3b6b97a69
484484
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
485485
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
486486
OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
@@ -512,4 +512,4 @@ SPEC CHECKSUMS:
512512

513513
PODFILE CHECKSUM: 5f0be4be03d6934478b9dd621bfbab4383b8c85d
514514

515-
COCOAPODS: 1.8.4
515+
COCOAPODS: 1.9.1

‎RNTester/RNTesterPods.xcodeproj/project.pbxproj

+14
Original file line numberDiff line numberDiff line change
@@ -784,13 +784,18 @@
784784
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
785785
);
786786
"LIBRARY_SEARCH_PATHS[arch=*]" = "$(inherited)";
787+
OTHER_CFLAGS = (
788+
"$(inherited)",
789+
"-DFB_SONARKIT_ENABLED=1",
790+
);
787791
OTHER_LDFLAGS = (
788792
"$(inherited)",
789793
"-ObjC",
790794
"-l\"stdc++\"",
791795
"-framework",
792796
"\"JavaScriptCore\"",
793797
);
798+
OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
794799
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
795800
PRODUCT_NAME = RNTester;
796801
TARGETED_DEVICE_FAMILY = "1,2";
@@ -845,13 +850,18 @@
845850
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
846851
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
847852
);
853+
OTHER_CFLAGS = (
854+
"$(inherited)",
855+
"-DFB_SONARKIT_ENABLED=1",
856+
);
848857
OTHER_LDFLAGS = (
849858
"$(inherited)",
850859
"-ObjC",
851860
"-l\"stdc++\"",
852861
"-framework",
853862
"\"JavaScriptCore\"",
854863
);
864+
OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
855865
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
856866
PRODUCT_NAME = RNTester;
857867
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1044,6 +1054,7 @@
10441054
"$(inherited)",
10451055
"-DFB_SONARKIT_ENABLED=1",
10461056
);
1057+
OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
10471058
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterUnitTests;
10481059
PRODUCT_NAME = "$(TARGET_NAME)";
10491060
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1079,6 +1090,7 @@
10791090
"$(inherited)",
10801091
"-DFB_SONARKIT_ENABLED=1",
10811092
);
1093+
OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
10821094
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterUnitTests;
10831095
PRODUCT_NAME = "$(TARGET_NAME)";
10841096
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1115,6 +1127,7 @@
11151127
"$(inherited)",
11161128
"-DFB_SONARKIT_ENABLED=1",
11171129
);
1130+
OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
11181131
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterIntegrationTests;
11191132
PRODUCT_NAME = "$(TARGET_NAME)";
11201133
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1148,6 +1161,7 @@
11481161
"$(inherited)",
11491162
"-DFB_SONARKIT_ENABLED=1",
11501163
);
1164+
OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
11511165
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterIntegrationTests;
11521166
PRODUCT_NAME = "$(TARGET_NAME)";
11531167
TARGETED_DEVICE_FAMILY = "1,2";

‎RNTester/android/app/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ android.useAndroidX=true
99
android.enableJetifier=true
1010

1111
# Version of flipper SDK to use with React Native
12-
FLIPPER_VERSION=0.33.1
12+
FLIPPER_VERSION=0.37.0

‎scripts/react_native_pods.rb

+30-5
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,17 @@ def use_react_native! (options={})
5858
end
5959

6060
def use_flipper!(versions = {})
61-
versions['Flipper'] ||= '~> 0.33.1'
61+
versions['Flipper'] ||= '~> 0.37.0'
6262
versions['DoubleConversion'] ||= '1.1.7'
63-
versions['Flipper-Folly'] ||= '~> 2.1'
63+
versions['Flipper-Folly'] ||= '~> 2.2'
6464
versions['Flipper-Glog'] ||= '0.3.6'
6565
versions['Flipper-PeerTalk'] ||= '~> 0.0.4'
66-
versions['Flipper-RSocket'] ||= '~> 1.0'
67-
66+
versions['Flipper-RSocket'] ||= '~> 1.1'
6867
pod 'FlipperKit', versions['Flipper'], :configuration => 'Debug'
6968
pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configuration => 'Debug'
7069
pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configuration => 'Debug'
7170
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', versions['Flipper'], :configuration => 'Debug'
7271
pod 'FlipperKit/FlipperKitReactPlugin', versions['Flipper'], :configuration => 'Debug'
73-
7472
# List all transitive dependencies for FlipperKit pods
7573
# to avoid them being linked in Release builds
7674
pod 'Flipper', versions['Flipper'], :configuration => 'Debug'
@@ -98,4 +96,31 @@ def flipper_post_install(installer)
9896
end
9997
end
10098
end
99+
file_name = Dir.glob("*.xcodeproj")[0]
100+
app_project = Xcodeproj::Project.open(file_name)
101+
app_project.native_targets.each do |target|
102+
target.build_configurations.each do |config|
103+
cflags = config.build_settings['OTHER_CFLAGS'] || '$(inherited) '
104+
unless cflags.include? '-DFB_SONARKIT_ENABLED=1'
105+
puts 'Adding -DFB_SONARKIT_ENABLED=1 in OTHER_CFLAGS...'
106+
cflags << '-DFB_SONARKIT_ENABLED=1'
107+
end
108+
config.build_settings['OTHER_CFLAGS'] = cflags
109+
if (config.build_settings['OTHER_SWIFT_FLAGS'])
110+
unless config.build_settings['OTHER_SWIFT_FLAGS'].include? '-DFB_SONARKIT_ENABLED'
111+
puts 'Adding -DFB_SONARKIT_ENABLED ...'
112+
swift_flags = config.build_settings['OTHER_SWIFT_FLAGS']
113+
if swift_flags.split.last != '-Xcc'
114+
config.build_settings['OTHER_SWIFT_FLAGS'] << ' -Xcc'
115+
end
116+
config.build_settings['OTHER_SWIFT_FLAGS'] << ' -DFB_SONARKIT_ENABLED'
117+
end
118+
else
119+
puts 'OTHER_SWIFT_FLAGS does not exist thus assigning it to `$(inherited) -Xcc -DFB_SONARKIT_ENABLED`'
120+
config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -Xcc -DFB_SONARKIT_ENABLED'
121+
end
122+
app_project.save
123+
end
124+
end
125+
installer.pods_project.save
101126
end

‎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.33.1
28+
FLIPPER_VERSION=0.37.0

0 commit comments

Comments
 (0)