From d444303fe2a3fe59f70c17f4eb37ff758a9e525e Mon Sep 17 00:00:00 2001 From: sunnylqm Date: Mon, 6 Apr 2020 22:35:22 +0800 Subject: [PATCH 1/3] Bump flipper to 0.36 --- RNTester/Podfile.lock | 118 ++++++++++++------------- RNTester/android/app/gradle.properties | 2 +- scripts/react_native_pods.rb | 2 +- template/android/gradle.properties | 2 +- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 4701a6f519d245..e498f1df67ea1b 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -11,7 +11,7 @@ PODS: - React-Core (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - - Flipper (0.33.1): + - Flipper (0.36.0): - Flipper-Folly (~> 2.1) - Flipper-RSocket (~> 1.0) - Flipper-DoubleConversion (1.1.7) @@ -25,36 +25,36 @@ PODS: - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.0.0): - Flipper-Folly (~> 2.0) - - FlipperKit (0.33.1): - - FlipperKit/Core (= 0.33.1) - - FlipperKit/Core (0.33.1): - - Flipper (~> 0.33.1) + - FlipperKit (0.36.0): + - FlipperKit/Core (= 0.36.0) + - FlipperKit/Core (0.36.0): + - Flipper (~> 0.36.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.33.1): - - Flipper (~> 0.33.1) - - FlipperKit/FBCxxFollyDynamicConvert (0.33.1): + - FlipperKit/CppBridge (0.36.0): + - Flipper (~> 0.36.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.36.0): - Flipper-Folly (~> 2.1) - - FlipperKit/FBDefines (0.33.1) - - FlipperKit/FKPortForwarding (0.33.1): + - FlipperKit/FBDefines (0.36.0) + - FlipperKit/FKPortForwarding (0.36.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.33.1) - - FlipperKit/FlipperKitLayoutPlugin (0.33.1): + - FlipperKit/FlipperKitHighlightOverlay (0.36.0) + - FlipperKit/FlipperKitLayoutPlugin (0.36.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.33.1) - - FlipperKit/FlipperKitNetworkPlugin (0.33.1): + - FlipperKit/FlipperKitLayoutTextSearchable (0.36.0) + - FlipperKit/FlipperKitNetworkPlugin (0.36.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.33.1): + - FlipperKit/FlipperKitReactPlugin (0.36.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.33.1): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.36.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.33.1): + - FlipperKit/SKIOSNetworkPlugin (0.36.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - Folly (2020.01.13.00): @@ -343,25 +343,25 @@ DEPENDENCIES: - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../Libraries/FBLazyVector`) - FBReactNativeSpec (from `../Libraries/FBReactNativeSpec`) - - Flipper (~> 0.33.1) + - Flipper (~> 0.36.0) - Flipper-DoubleConversion (= 1.1.7) - Flipper-Folly (~> 2.1) - Flipper-Glog (= 0.3.6) - Flipper-PeerTalk (~> 0.0.4) - Flipper-RSocket (~> 1.0) - - FlipperKit (~> 0.33.1) - - FlipperKit/Core (~> 0.33.1) - - FlipperKit/CppBridge (~> 0.33.1) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.33.1) - - FlipperKit/FBDefines (~> 0.33.1) - - FlipperKit/FKPortForwarding (~> 0.33.1) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.33.1) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.33.1) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.33.1) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.33.1) - - FlipperKit/FlipperKitReactPlugin (~> 0.33.1) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.33.1) - - FlipperKit/SKIOSNetworkPlugin (~> 0.33.1) + - FlipperKit (~> 0.36.0) + - FlipperKit/Core (~> 0.36.0) + - FlipperKit/CppBridge (~> 0.36.0) + - FlipperKit/FBCxxFollyDynamicConvert (~> 0.36.0) + - FlipperKit/FBDefines (~> 0.36.0) + - FlipperKit/FKPortForwarding (~> 0.36.0) + - FlipperKit/FlipperKitHighlightOverlay (~> 0.36.0) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.36.0) + - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.36.0) + - FlipperKit/FlipperKitNetworkPlugin (~> 0.36.0) + - FlipperKit/FlipperKitReactPlugin (~> 0.36.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.36.0) + - FlipperKit/SKIOSNetworkPlugin (~> 0.36.0) - Folly (from `../third-party-podspecs/Folly.podspec`) - glog (from `../third-party-podspecs/glog.podspec`) - RCTRequired (from `../Libraries/RCTRequired`) @@ -472,42 +472,42 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: cde416483dac037923206447da6e1454df403714 - FBLazyVector: 8ea0285646adaf7fa725c20ed737c49ee5ea680a - FBReactNativeSpec: e8f07c749b9cf184c819f5a8ca44b91ab61fca12 - Flipper: 6c1f484f9a88d30ab3e272800d53688439e50f69 + FBLazyVector: 40dcb3eb8e80e9da252222441d60f6db8a8a75b8 + FBReactNativeSpec: 267367e6b30c722f18777d8b060f3ff460530220 + Flipper: 7a86ab09a81b0999bced1930358a9cfe2262e66d Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 - FlipperKit: 6dc9b8f4ef60d9e5ded7f0264db299c91f18832e + FlipperKit: 6339bfd4fe581745af9ef79b4258d8f47cb89f96 Folly: b73c3869541e86821df3c387eb0af5f65addfab4 glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - RCTRequired: 34582e9b3ebe69f244e091f37218d318406d5c4a - RCTTypeSafety: 1ade47a69b092cddf1e4ea21e0c5bdc65cc950b4 - React: cafb3c2321f7df55ce90dbf29d513799a79e4418 - React-ART: df0460bdff42ef039e28ee3ffd41f50b75644788 - React-callinvoker: 0dada022d38b73e6e15b33e2a96476153f79bbf6 - React-Core: 08c69f013e6fd654ea8f9fd84bbd66780a54d886 - React-CoreModules: d13d148c851af5780f864be74bc2165140923dc7 - React-cxxreact: 091da030e879ed93d970e95dd74fcbacb2a1d661 - React-jsi: fe94132da767bfc4801968c2a12abae43e9a833e - React-jsiexecutor: 55eff40b2e0696e7a979016e321793ec8b28a2ac - React-jsinspector: 7fbf9b42b58b02943a0d89b0ba9fff0070f2de98 - React-RCTActionSheet: 51c43beeb74ef41189e87fe9823e53ebf6210359 - React-RCTAnimation: 9d09196c641c1ebfef3a4e9ae670bcda5fadb420 - React-RCTBlob: 715489626cf44d28ee51e5277a4d559167351696 - React-RCTImage: 19151d2d071b05c3832a0b212473cafa4ea8948f - React-RCTLinking: 7c94c0f2fcc658cb4043dacb4f6621dca2f8f8b5 - React-RCTNetwork: 7596e84acacd5d0674e9743b55c5bf61a626af69 - React-RCTPushNotification: 88c9f47ff0d4391d5136d70745f15713cdc5f6bb - React-RCTSettings: a29c61f85f535ba2eff54d80bef2ea3cdb6e5fba - React-RCTTest: cfe25fcf70b04a747dba4326105db398250caa9a - React-RCTText: 6c01963d3e562109f5548262b09b1b2bc260dd60 - React-RCTVibration: d42d73dafd9f63cf758656ee743aa80c566798ff - ReactCommon: 39e00b754f5e1628804fab28f44146d06280f700 - Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae + RCTRequired: aeeb1d8c0d3ba97c30be71071d3e896d73e5350b + RCTTypeSafety: d86db67c0539b8053c0e1d63df09b92eab1da045 + React: 39d2d913ace1e83b33f978821e62f0f3ca076a22 + React-ART: 62be261685119c3bc21d38ef037120289b469b98 + React-callinvoker: 573909a53658835206ac6eccf740faed0e682d2e + React-Core: 0651995ee7daec6b8d2eabdc4d474f356b8f47d0 + React-CoreModules: 738dadae1bd61df423c0ae13573a99b7c6620306 + React-cxxreact: 987ccbf3b1dee64d0cef40431c8a54cc1cd2790e + React-jsi: e182824475578ad2514aebec3f2755df7a77f0a2 + React-jsiexecutor: abff4045738535c4c92e3d006453e4e5708577ec + React-jsinspector: 07a81a2656caa8ef4bf1c7ffcb045c580664c349 + React-RCTActionSheet: b9dd0e8ccf729790565877b2a2b0a9476924703c + React-RCTAnimation: 20a8e423c430f1d346aa8130971c43374420fcf4 + React-RCTBlob: 99cd33222f9c5d1a31338f5a09021376daed2ab9 + React-RCTImage: 4bce5110a703fcd4fdf27a554509d2592a475132 + React-RCTLinking: 0b96cf633a65bc6467c32a632becf01f594eca95 + React-RCTNetwork: 1f56c12446ece3d64dd65e8769a373e34238dc36 + React-RCTPushNotification: a63a11d93a6ab1e2900ecd7104ffcd0f7e4d7a6f + React-RCTSettings: b55bdc40200abda0ee6bd9245df97c069c06aa06 + React-RCTTest: 69b5a4b9bec846409b4a7e99958a7e8ee3a90151 + React-RCTText: f29137339220efa4bada8d0f3b8ba1b3074dffd8 + React-RCTVibration: 0e369e4343ac6e78e1965884a8936e79e0808196 + ReactCommon: 24158eea0ea72a3b9f7d3a318a2816c1a58452c0 + Yoga: 2fa36a573f5469fde4fef306374eeb7cea81139e YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 5f0be4be03d6934478b9dd621bfbab4383b8c85d diff --git a/RNTester/android/app/gradle.properties b/RNTester/android/app/gradle.properties index 3d9a626c164f38..ec020aeafcfc47 100644 --- a/RNTester/android/app/gradle.properties +++ b/RNTester/android/app/gradle.properties @@ -9,4 +9,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.33.1 +FLIPPER_VERSION=0.36.0 diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb index 21984326468080..7e7800d66ec2ca 100644 --- a/scripts/react_native_pods.rb +++ b/scripts/react_native_pods.rb @@ -58,7 +58,7 @@ def use_react_native! (options={}) end def use_flipper!(versions = {}) - versions['Flipper'] ||= '~> 0.33.1' + versions['Flipper'] ||= '~> 0.36.0' versions['DoubleConversion'] ||= '1.1.7' versions['Flipper-Folly'] ||= '~> 2.1' versions['Flipper-Glog'] ||= '0.3.6' diff --git a/template/android/gradle.properties b/template/android/gradle.properties index 1bbc8cc20f27f5..6aa3c96c5b26c9 100644 --- a/template/android/gradle.properties +++ b/template/android/gradle.properties @@ -25,4 +25,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.33.1 +FLIPPER_VERSION=0.36.0 From 46c39a11810d47f9613311bcbd655af7f54be112 Mon Sep 17 00:00:00 2001 From: sunnylqm Date: Sat, 11 Apr 2020 11:00:45 +0800 Subject: [PATCH 2/3] Bump flipper to 0.37 --- RNTester/Podfile.lock | 138 ++++++++++++------------- RNTester/android/app/gradle.properties | 2 +- scripts/react_native_pods.rb | 6 +- template/android/gradle.properties | 2 +- 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index e498f1df67ea1b..19c12ab85f442e 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -11,11 +11,11 @@ PODS: - React-Core (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - - Flipper (0.36.0): - - Flipper-Folly (~> 2.1) - - Flipper-RSocket (~> 1.0) + - Flipper (0.37.0): + - Flipper-Folly (~> 2.2) + - Flipper-RSocket (~> 1.1) - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.1.1): + - Flipper-Folly (2.2.0): - boost-for-react-native - CocoaLibEvent (~> 1.0) - Flipper-DoubleConversion @@ -23,38 +23,38 @@ PODS: - OpenSSL-Universal (= 1.0.2.19) - Flipper-Glog (0.3.6) - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.0.0): - - Flipper-Folly (~> 2.0) - - FlipperKit (0.36.0): - - FlipperKit/Core (= 0.36.0) - - FlipperKit/Core (0.36.0): - - Flipper (~> 0.36.0) + - Flipper-RSocket (1.1.0): + - Flipper-Folly (~> 2.2) + - FlipperKit (0.37.0): + - FlipperKit/Core (= 0.37.0) + - FlipperKit/Core (0.37.0): + - Flipper (~> 0.37.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.36.0): - - Flipper (~> 0.36.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.36.0): - - Flipper-Folly (~> 2.1) - - FlipperKit/FBDefines (0.36.0) - - FlipperKit/FKPortForwarding (0.36.0): + - FlipperKit/CppBridge (0.37.0): + - Flipper (~> 0.37.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.37.0): + - Flipper-Folly (~> 2.2) + - FlipperKit/FBDefines (0.37.0) + - FlipperKit/FKPortForwarding (0.37.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.36.0) - - FlipperKit/FlipperKitLayoutPlugin (0.36.0): + - FlipperKit/FlipperKitHighlightOverlay (0.37.0) + - FlipperKit/FlipperKitLayoutPlugin (0.37.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.36.0) - - FlipperKit/FlipperKitNetworkPlugin (0.36.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.37.0) + - FlipperKit/FlipperKitNetworkPlugin (0.37.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.36.0): + - FlipperKit/FlipperKitReactPlugin (0.37.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.36.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.37.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.36.0): + - FlipperKit/SKIOSNetworkPlugin (0.37.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - Folly (2020.01.13.00): @@ -343,25 +343,25 @@ DEPENDENCIES: - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../Libraries/FBLazyVector`) - FBReactNativeSpec (from `../Libraries/FBReactNativeSpec`) - - Flipper (~> 0.36.0) + - Flipper (~> 0.37.0) - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.1) + - Flipper-Folly (~> 2.2) - Flipper-Glog (= 0.3.6) - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.0) - - FlipperKit (~> 0.36.0) - - FlipperKit/Core (~> 0.36.0) - - FlipperKit/CppBridge (~> 0.36.0) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.36.0) - - FlipperKit/FBDefines (~> 0.36.0) - - FlipperKit/FKPortForwarding (~> 0.36.0) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.36.0) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.36.0) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.36.0) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.36.0) - - FlipperKit/FlipperKitReactPlugin (~> 0.36.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.36.0) - - FlipperKit/SKIOSNetworkPlugin (~> 0.36.0) + - Flipper-RSocket (~> 1.1) + - FlipperKit (~> 0.37.0) + - FlipperKit/Core (~> 0.37.0) + - FlipperKit/CppBridge (~> 0.37.0) + - FlipperKit/FBCxxFollyDynamicConvert (~> 0.37.0) + - FlipperKit/FBDefines (~> 0.37.0) + - FlipperKit/FKPortForwarding (~> 0.37.0) + - FlipperKit/FlipperKitHighlightOverlay (~> 0.37.0) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.37.0) + - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.37.0) + - FlipperKit/FlipperKitNetworkPlugin (~> 0.37.0) + - FlipperKit/FlipperKitReactPlugin (~> 0.37.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.37.0) + - FlipperKit/SKIOSNetworkPlugin (~> 0.37.0) - Folly (from `../third-party-podspecs/Folly.podspec`) - glog (from `../third-party-podspecs/glog.podspec`) - RCTRequired (from `../Libraries/RCTRequired`) @@ -472,42 +472,42 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: cde416483dac037923206447da6e1454df403714 - FBLazyVector: 40dcb3eb8e80e9da252222441d60f6db8a8a75b8 - FBReactNativeSpec: 267367e6b30c722f18777d8b060f3ff460530220 - Flipper: 7a86ab09a81b0999bced1930358a9cfe2262e66d + FBLazyVector: c86446d31933e8df87ae05ce2634302c75806835 + FBReactNativeSpec: aaf7a8cd29452683cbad4a07917d4f7752f7d239 + Flipper: 1670db365568191bd123a0c905b834e77ba9e3d3 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 + Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 - FlipperKit: 6339bfd4fe581745af9ef79b4258d8f47cb89f96 + Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 + FlipperKit: afd4259ef9eadeeb2d30250b37d95cb3b6b97a69 Folly: b73c3869541e86821df3c387eb0af5f65addfab4 glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - RCTRequired: aeeb1d8c0d3ba97c30be71071d3e896d73e5350b - RCTTypeSafety: d86db67c0539b8053c0e1d63df09b92eab1da045 - React: 39d2d913ace1e83b33f978821e62f0f3ca076a22 - React-ART: 62be261685119c3bc21d38ef037120289b469b98 - React-callinvoker: 573909a53658835206ac6eccf740faed0e682d2e - React-Core: 0651995ee7daec6b8d2eabdc4d474f356b8f47d0 - React-CoreModules: 738dadae1bd61df423c0ae13573a99b7c6620306 - React-cxxreact: 987ccbf3b1dee64d0cef40431c8a54cc1cd2790e - React-jsi: e182824475578ad2514aebec3f2755df7a77f0a2 - React-jsiexecutor: abff4045738535c4c92e3d006453e4e5708577ec - React-jsinspector: 07a81a2656caa8ef4bf1c7ffcb045c580664c349 - React-RCTActionSheet: b9dd0e8ccf729790565877b2a2b0a9476924703c - React-RCTAnimation: 20a8e423c430f1d346aa8130971c43374420fcf4 - React-RCTBlob: 99cd33222f9c5d1a31338f5a09021376daed2ab9 - React-RCTImage: 4bce5110a703fcd4fdf27a554509d2592a475132 - React-RCTLinking: 0b96cf633a65bc6467c32a632becf01f594eca95 - React-RCTNetwork: 1f56c12446ece3d64dd65e8769a373e34238dc36 - React-RCTPushNotification: a63a11d93a6ab1e2900ecd7104ffcd0f7e4d7a6f - React-RCTSettings: b55bdc40200abda0ee6bd9245df97c069c06aa06 - React-RCTTest: 69b5a4b9bec846409b4a7e99958a7e8ee3a90151 - React-RCTText: f29137339220efa4bada8d0f3b8ba1b3074dffd8 - React-RCTVibration: 0e369e4343ac6e78e1965884a8936e79e0808196 - ReactCommon: 24158eea0ea72a3b9f7d3a318a2816c1a58452c0 - Yoga: 2fa36a573f5469fde4fef306374eeb7cea81139e + RCTRequired: 464763a3644e254672da885ec97df2a38e6deec0 + RCTTypeSafety: 9acaa6bde7995205b96ea2c3ef253e53ee43a3e2 + React: 3d5f9571fd2786b7f98fdb9bc4794b864a3b60dd + React-ART: 0283c02f78897b8f60cc996cd98109db3f59c015 + React-callinvoker: c2fa564623e0f484013dd7915c34226e1011bc56 + React-Core: 7d9f78cbe7adfa77cacbfddb74c7d712d8fa190f + React-CoreModules: ea89f5074ede07d2246a1e2fae289fd673ae96a0 + React-cxxreact: ca7cb2c2fc7583baa30323a5808e84f86a878798 + React-jsi: db3e73645f0952ac1af11720a17d2e22b4f00914 + React-jsiexecutor: 07186235c93ca9bd73086f3ae7c7b6344d8e804a + React-jsinspector: 2281cd37da566ae1f0f210b4601b575dcf8c85c4 + React-RCTActionSheet: a57d6178ad75b729bbb0c14c921cdd035acb1e51 + React-RCTAnimation: 702e907ea482ed5966ec081f481ae3830bac4521 + React-RCTBlob: 8f0483ff0eb604af1c4204ebef14a6ffb5bf0a6b + React-RCTImage: fec9f5b61eff2fecac0eacbedfad30a3798abb14 + React-RCTLinking: 72330a7e3eab239453ea4c1fb468542f0b7ba5f8 + React-RCTNetwork: 6ff8310822d30400f6b85f482365e3262522c4cc + React-RCTPushNotification: 45bedbd0bc820e01422bdc2853a8aeb8679da93a + React-RCTSettings: a1a9640b965b8133c93f762fb48db40a738691fc + React-RCTTest: 8b706e42e27c9097b335268a3c263dc9b17ff29a + React-RCTText: 44e93c961faca5567e9c2e426150e22954e8b419 + React-RCTVibration: 6b2d289f1bbf3040e64f5ddc76475fccbc17fd98 + ReactCommon: c2ec7fa780426cd52a4f2a9a691c079880a5834b + Yoga: c79d470cba9fa41733450df55bb6af2679573797 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 5f0be4be03d6934478b9dd621bfbab4383b8c85d diff --git a/RNTester/android/app/gradle.properties b/RNTester/android/app/gradle.properties index ec020aeafcfc47..4ff9751aab7d8b 100644 --- a/RNTester/android/app/gradle.properties +++ b/RNTester/android/app/gradle.properties @@ -9,4 +9,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.36.0 +FLIPPER_VERSION=0.37.0 diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb index 7e7800d66ec2ca..02747cc43f266f 100644 --- a/scripts/react_native_pods.rb +++ b/scripts/react_native_pods.rb @@ -58,12 +58,12 @@ def use_react_native! (options={}) end def use_flipper!(versions = {}) - versions['Flipper'] ||= '~> 0.36.0' + versions['Flipper'] ||= '~> 0.37.0' versions['DoubleConversion'] ||= '1.1.7' - versions['Flipper-Folly'] ||= '~> 2.1' + versions['Flipper-Folly'] ||= '~> 2.2' versions['Flipper-Glog'] ||= '0.3.6' versions['Flipper-PeerTalk'] ||= '~> 0.0.4' - versions['Flipper-RSocket'] ||= '~> 1.0' + versions['Flipper-RSocket'] ||= '~> 1.1' pod 'FlipperKit', versions['Flipper'], :configuration => 'Debug' pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configuration => 'Debug' diff --git a/template/android/gradle.properties b/template/android/gradle.properties index 6aa3c96c5b26c9..04ca0ef29e7d10 100644 --- a/template/android/gradle.properties +++ b/template/android/gradle.properties @@ -25,4 +25,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.36.0 +FLIPPER_VERSION=0.37.0 From dc519bb4af78fc706da8bdb650de9bda2a1e420f Mon Sep 17 00:00:00 2001 From: sunnylqm Date: Wed, 15 Apr 2020 00:13:42 +0800 Subject: [PATCH 3/3] Add DFB_SONARKIT_ENABLED flags --- scripts/react_native_pods.rb | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb index 02747cc43f266f..5a2726e0d85354 100644 --- a/scripts/react_native_pods.rb +++ b/scripts/react_native_pods.rb @@ -64,13 +64,11 @@ def use_flipper!(versions = {}) versions['Flipper-Glog'] ||= '0.3.6' versions['Flipper-PeerTalk'] ||= '~> 0.0.4' versions['Flipper-RSocket'] ||= '~> 1.1' - pod 'FlipperKit', versions['Flipper'], :configuration => 'Debug' pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configuration => 'Debug' pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configuration => 'Debug' pod 'FlipperKit/FlipperKitUserDefaultsPlugin', versions['Flipper'], :configuration => 'Debug' pod 'FlipperKit/FlipperKitReactPlugin', versions['Flipper'], :configuration => 'Debug' - # List all transitive dependencies for FlipperKit pods # to avoid them being linked in Release builds pod 'Flipper', versions['Flipper'], :configuration => 'Debug' @@ -98,4 +96,31 @@ def flipper_post_install(installer) end end end + file_name = Dir.glob("*.xcodeproj")[0] + app_project = Xcodeproj::Project.open(file_name) + app_project.native_targets.each do |target| + target.build_configurations.each do |config| + cflags = config.build_settings['OTHER_CFLAGS'] || '$(inherited) ' + unless cflags.include? '-DFB_SONARKIT_ENABLED=1' + puts 'Adding -DFB_SONARKIT_ENABLED=1 in OTHER_CFLAGS...' + cflags << '-DFB_SONARKIT_ENABLED=1' + end + config.build_settings['OTHER_CFLAGS'] = cflags + if (config.build_settings['OTHER_SWIFT_FLAGS']) + unless config.build_settings['OTHER_SWIFT_FLAGS'].include? '-DFB_SONARKIT_ENABLED' + puts 'Adding -DFB_SONARKIT_ENABLED ...' + swift_flags = config.build_settings['OTHER_SWIFT_FLAGS'] + if swift_flags.split.last != '-Xcc' + config.build_settings['OTHER_SWIFT_FLAGS'] << ' -Xcc' + end + config.build_settings['OTHER_SWIFT_FLAGS'] << ' -DFB_SONARKIT_ENABLED' + end + else + puts 'OTHER_SWIFT_FLAGS does not exist thus assigning it to `$(inherited) -Xcc -DFB_SONARKIT_ENABLED`' + config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -Xcc -DFB_SONARKIT_ENABLED' + end + app_project.save + end + end + installer.pods_project.save end