From 05708538518cb34eb07170fe0fa49cbcf4e4366a Mon Sep 17 00:00:00 2001 From: Daniel Wiese Date: Tue, 31 Mar 2020 13:18:21 -0400 Subject: [PATCH] remove Flipper - Flipper errors when building for macos target - See: https://github.com/facebook/flipper/issues/834 --- ios/Podfile | 29 ---------- ios/Podfile.lock | 82 +-------------------------- ios/ReactNativeCatalyst/AppDelegate.m | 23 -------- 3 files changed, 1 insertion(+), 133 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 56d657d..5a70f2e 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,26 +1,6 @@ platform :ios, '9.0' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -def add_flipper_pods! - version = '~> 0.33.1' - pod 'FlipperKit', version, :configuration => 'Debug' - pod 'FlipperKit/FlipperKitLayoutPlugin', version, :configuration => 'Debug' - pod 'FlipperKit/SKIOSNetworkPlugin', version, :configuration => 'Debug' - pod 'FlipperKit/FlipperKitUserDefaultsPlugin', version, :configuration => 'Debug' - pod 'FlipperKit/FlipperKitReactPlugin', version, :configuration => 'Debug' -end - -# Post Install processing for Flipper -def flipper_post_install(installer) - installer.pods_project.targets.each do |target| - if target.name == 'YogaKit' - target.build_configurations.each do |config| - config.build_settings['SWIFT_VERSION'] = '4.1' - end - end - end -end - target 'ReactNativeCatalyst' do # Pods for ReactNativeCatalyst pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector" @@ -60,15 +40,6 @@ target 'ReactNativeCatalyst' do end use_native_modules! - - # Enables Flipper. - # - # Note that if you have use_frameworks! enabled, Flipper will not work and - # you should disable these next few lines. - add_flipper_pods! - post_install do |installer| - flipper_post_install(installer) - end end target 'ReactNativeCatalyst-tvOS' do diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c6e9d75..67fc617 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,7 +1,5 @@ PODS: - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.4) - - CocoaLibEvent (1.0.0) - DoubleConversion (1.1.6) - FBLazyVector (0.62.0) - FBReactNativeSpec (0.62.0): @@ -11,52 +9,6 @@ PODS: - React-Core (= 0.62.0) - React-jsi (= 0.62.0) - ReactCommon/turbomodule/core (= 0.62.0) - - Flipper (0.33.1): - - Flipper-Folly (~> 2.1) - - Flipper-RSocket (~> 1.0) - - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.1.1): - - boost-for-react-native - - CocoaLibEvent (~> 1.0) - - Flipper-DoubleConversion - - Flipper-Glog - - 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.33.1): - - FlipperKit/Core (= 0.33.1) - - FlipperKit/Core (0.33.1): - - Flipper (~> 0.33.1) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.33.1): - - Flipper (~> 0.33.1) - - FlipperKit/FBCxxFollyDynamicConvert (0.33.1): - - Flipper-Folly (~> 2.1) - - FlipperKit/FBDefines (0.33.1) - - FlipperKit/FKPortForwarding (0.33.1): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.33.1) - - FlipperKit/FlipperKitLayoutPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.33.1) - - FlipperKit/FlipperKitNetworkPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.33.1): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - Folly (2018.10.22.00): - boost-for-react-native - DoubleConversion @@ -67,9 +19,6 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) - RCTRequired (0.62.0) - RCTTypeSafety (0.62.0): - FBLazyVector (= 0.62.0) @@ -293,18 +242,11 @@ PODS: - React-jsi (= 0.62.0) - ReactCommon/callinvoker (= 0.62.0) - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - FlipperKit (~> 0.33.1) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.33.1) - - FlipperKit/FlipperKitReactPlugin (~> 0.33.1) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.33.1) - - FlipperKit/SKIOSNetworkPlugin (~> 0.33.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`) @@ -334,17 +276,6 @@ DEPENDENCIES: SPEC REPOS: trunk: - boost-for-react-native - - CocoaAsyncSocket - - CocoaLibEvent - - Flipper - - Flipper-DoubleConversion - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - FlipperKit - - OpenSSL-Universal - - YogaKit EXTERNAL SOURCES: DoubleConversion: @@ -400,21 +331,11 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 - CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: 545eccf4f6ef2de8fd450fd8a1edb3f913c7371a FBReactNativeSpec: 85c7f8347f4a6e911742228e89e245187afa298e - Flipper: 6c1f484f9a88d30ab3e272800d53688439e50f69 - Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 - FlipperKit: 6dc9b8f4ef60d9e5ded7f0264db299c91f18832e Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 RCTRequired: 0873f5bdb1762d2b9b1ae16a01c4f91d6ee3b6dd RCTTypeSafety: a605e0cc0e4220f6e65896bd9e675073c2978f35 React: 8abf6bdd2b05538e9445f7bbda800df744068bfe @@ -435,8 +356,7 @@ SPEC CHECKSUMS: React-RCTVibration: 0630aeb11e22f87c180ca9c0c3a0a0aba780cc62 ReactCommon: d22162ab8f1358c53dfcd0f9c4d82d38facdbc48 Yoga: 9db9ff2025ad21d1ac0a8b3c85d5ac4e7c29d525 - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: d0db5c08eeb2a5310b1ece1aa37c3ebc7da7369d +PODFILE CHECKSUM: e21bab295d6a971ad207b2f5aca9f1454312840a COCOAPODS: 1.8.3 diff --git a/ios/ReactNativeCatalyst/AppDelegate.m b/ios/ReactNativeCatalyst/AppDelegate.m index 38df22d..4cc0017 100644 --- a/ios/ReactNativeCatalyst/AppDelegate.m +++ b/ios/ReactNativeCatalyst/AppDelegate.m @@ -4,33 +4,10 @@ #import #import -#if DEBUG -#import -#import -#import -#import -#import -#import - -static void InitializeFlipper(UIApplication *application) { - FlipperClient *client = [FlipperClient sharedClient]; - SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults]; - [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]]; - [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]]; - [client addPlugin:[FlipperKitReactPlugin new]]; - [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]]; - [client start]; -} -#endif - @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { -#if DEBUG - InitializeFlipper(application); -#endif - RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"ReactNativeCatalyst"