From 1ade53db99f203b5df8341d7f08b7d22d36dc7ff Mon Sep 17 00:00:00 2001 From: Chris Bobbe Date: Mon, 30 Nov 2020 18:24:31 -0500 Subject: [PATCH] flipper ios: Take a RN change that depends on Flipper 41; take Flipper 41. Part of the RN v0.62 -> v0.63 changes to the template app [1], corresponding to facebook/react-native@29639e7b9, plus necessary changes to the Podfile. The interesting change to the Podfile is the upgrade to Flipper v0.41.0; the s/DoubleConversion/Flipper-DoubleConversion change is NFC. Here's why this commit touches our Podfile, while the RN upstream commit doesn't: the upstream commit came after facebook/react-native@619d5d60d, in which React Native stopped pushing lots of Flipper configuration code out to the consumer's Podfile. So we'll eventually get to stop making changes like these to the Podfile, but not until we've taken the changes in React Native, which we'll do by upgrading to v0.63. facebook/react-native@29639e7b9 also has a chunk of deletions alongside the Flipper v0.41.0 upgrade. That chunk is a clean reversion of a chunk of insertions in facebook/react-native@27ccc6019 -- so we simplify by not taking the insertions in the first place. [1] https://react-native-community.github.io/upgrade-helper/?from=0.62.2&to=0.63.4 --- ios/Podfile | 6 +- ios/Podfile.lock | 68 +++++++++++------------ ios/ZulipMobile.xcodeproj/project.pbxproj | 4 -- ios/ZulipMobile/AppDelegate.m | 4 +- 4 files changed, 39 insertions(+), 43 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 96cd93b9022..a1328490e93 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -7,8 +7,8 @@ require_relative '../node_modules/react-native-unimodules/cocoapods.rb' # Add Flipper Pods def add_flipper_pods!(versions = {}) - versions['Flipper'] ||= '~> 0.39.0' - versions['DoubleConversion'] ||= '1.1.7' + versions['Flipper'] ||= '~> 0.41.1' + versions['Flipper-DoubleConversion'] ||= '1.1.7' versions['Flipper-Folly'] ||= '~> 2.2' versions['Flipper-Glog'] ||= '0.3.6' versions['Flipper-PeerTalk'] ||= '~> 0.0.4' @@ -23,7 +23,7 @@ def add_flipper_pods!(versions = {}) # List all transitive dependencies for FlipperKit pods # to avoid them being linked in Release builds pod 'Flipper', versions['Flipper'], :configuration => 'Debug' - pod 'Flipper-DoubleConversion', versions['DoubleConversion'], :configuration => 'Debug' + pod 'Flipper-DoubleConversion', versions['Flipper-DoubleConversion'], :configuration => 'Debug' pod 'Flipper-Folly', versions['Flipper-Folly'], :configuration => 'Debug' pod 'Flipper-Glog', versions['Flipper-Glog'], :configuration => 'Debug' pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configuration => 'Debug' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b5301bf8c9c..e53ee0d5dc2 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -34,7 +34,7 @@ PODS: - React-Core (= 0.62.2) - React-jsi (= 0.62.2) - ReactCommon/turbomodule/core (= 0.62.2) - - Flipper (0.39.0): + - Flipper (0.41.5): - Flipper-Folly (~> 2.2) - Flipper-RSocket (~> 1.1) - Flipper-DoubleConversion (1.1.7) @@ -48,36 +48,36 @@ PODS: - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.1.0): - Flipper-Folly (~> 2.2) - - FlipperKit (0.39.0): - - FlipperKit/Core (= 0.39.0) - - FlipperKit/Core (0.39.0): - - Flipper (~> 0.39.0) + - FlipperKit (0.41.5): + - FlipperKit/Core (= 0.41.5) + - FlipperKit/Core (0.41.5): + - Flipper (~> 0.41.5) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.39.0): - - Flipper (~> 0.39.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.39.0): + - FlipperKit/CppBridge (0.41.5): + - Flipper (~> 0.41.5) + - FlipperKit/FBCxxFollyDynamicConvert (0.41.5): - Flipper-Folly (~> 2.2) - - FlipperKit/FBDefines (0.39.0) - - FlipperKit/FKPortForwarding (0.39.0): + - FlipperKit/FBDefines (0.41.5) + - FlipperKit/FKPortForwarding (0.41.5): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.39.0) - - FlipperKit/FlipperKitLayoutPlugin (0.39.0): + - FlipperKit/FlipperKitHighlightOverlay (0.41.5) + - FlipperKit/FlipperKitLayoutPlugin (0.41.5): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.39.0) - - FlipperKit/FlipperKitNetworkPlugin (0.39.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.41.5) + - FlipperKit/FlipperKitNetworkPlugin (0.41.5): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.39.0): + - FlipperKit/FlipperKitReactPlugin (0.41.5): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.39.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.41.5): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.39.0): + - FlipperKit/SKIOSNetworkPlugin (0.41.5): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - Folly (2018.10.22.00): @@ -408,25 +408,25 @@ DEPENDENCIES: - EXSplashScreen (from `../node_modules/expo-splash-screen/ios`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - Flipper (~> 0.39.0) + - Flipper (~> 0.41.1) - 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.39.0) - - FlipperKit/Core (~> 0.39.0) - - FlipperKit/CppBridge (~> 0.39.0) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.39.0) - - FlipperKit/FBDefines (~> 0.39.0) - - FlipperKit/FKPortForwarding (~> 0.39.0) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.39.0) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.39.0) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.39.0) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.39.0) - - FlipperKit/FlipperKitReactPlugin (~> 0.39.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.39.0) - - FlipperKit/SKIOSNetworkPlugin (~> 0.39.0) + - 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) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -652,13 +652,13 @@ SPEC CHECKSUMS: EXSplashScreen: 9423d258b71afa5bf128a83dcb57b636d9900a74 FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245 FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e - Flipper: bee8d5809012d1b6affa747fb756567ecd8c7c0b + Flipper: 33585e2d9810fe5528346be33bcf71b37bb7ae13 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 - FlipperKit: 45e659ff1bfa264bb55ea0b20926c9c11599c628 + FlipperKit: bc68102cd4952a258a23c9c1b316c7bec1fecf83 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 @@ -719,6 +719,6 @@ SPEC CHECKSUMS: Yoga: 3ebccbdd559724312790e7742142d062476b698e YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 23199ae4da3e497acab65de2acdb3fbe33df422a +PODFILE CHECKSUM: 2098a5738fcf8e011b27c6617682cc556b037345 COCOAPODS: 1.9.3 diff --git a/ios/ZulipMobile.xcodeproj/project.pbxproj b/ios/ZulipMobile.xcodeproj/project.pbxproj index bdc06efa806..0ed75b1a5eb 100644 --- a/ios/ZulipMobile.xcodeproj/project.pbxproj +++ b/ios/ZulipMobile.xcodeproj/project.pbxproj @@ -392,10 +392,6 @@ DEVELOPMENT_TEAM = 66KHCWMEYB; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "FB_SONARKIT_ENABLED=1", - ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = ZulipMobile/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; diff --git a/ios/ZulipMobile/AppDelegate.m b/ios/ZulipMobile/AppDelegate.m index 6a83344275b..f75722e0596 100644 --- a/ios/ZulipMobile/AppDelegate.m +++ b/ios/ZulipMobile/AppDelegate.m @@ -13,7 +13,7 @@ #import #import -#if DEBUG +#ifdef FB_SONARKIT_ENABLED #import #import #import @@ -36,7 +36,7 @@ @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - #if DEBUG + #ifdef FB_SONARKIT_ENABLED InitializeFlipper(application); #endif