From 13cefd396c4c745f566a01892121aaaf3ab0cc05 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Wed, 12 Feb 2020 04:46:58 -0800 Subject: [PATCH] @allow-large-files [Flipper][RN] Integrated Flipper in RNTester application Summary: Changelog: [iOS] [Fixed] Integrated Flipper in RNTester application and made sure that flipper connects with RNTester application allow-large-files Reviewed By: rickhanlonii Differential Revision: D19813213 fbshipit-source-id: f0c7a5a42ffaccd488582b0f42ce37aea946c636 --- RNTester/Podfile | 50 +- RNTester/Podfile.lock | 476 ++++++++++-------- RNTester/RNTester/AppDelegate.mm | 30 ++ .../RNTesterPods.xcodeproj/project.pbxproj | 71 ++- 4 files changed, 409 insertions(+), 218 deletions(-) diff --git a/RNTester/Podfile b/RNTester/Podfile index d7fa6188ad4..d03422662aa 100644 --- a/RNTester/Podfile +++ b/RNTester/Podfile @@ -17,15 +17,62 @@ def pods() # Additional Pods which aren't included in the default Podfile pod 'React-ART', :path => '../Libraries/ART' pod 'React-RCTPushNotification', :path => '../Libraries/PushNotificationIOS' - + pod 'Yoga',:path => '../ReactCommon/yoga', :modular_headers => true # Additional Pods which are classed as unstable # # To use fabric: add `fabric_enabled` option to the use_react_native method above, like below # use_react_native!(path: "..", fabric_enabled: true) end + +def flipper_pods() + flipperkit_version = '0.30.1' + pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug' + pod 'FlipperKit/FlipperKitLayoutPlugin', '~>' + flipperkit_version, :configuration => 'Debug' + pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug' + pod 'FlipperKit/FlipperKitUserDefaultsPlugin', '~>' + flipperkit_version, :configuration => 'Debug' + pod 'FlipperKit/FlipperKitReactPlugin', '~>' + flipperkit_version, :configuration => 'Debug' + + if ENV['USE_FRAMEWORKS'] == '1' + $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly', + 'CocoaAsyncSocket', 'ComponentKit', 'Flipper-DoubleConversion', + 'Flipper-Glog', 'Flipper-PeerTalk', 'Flipper-RSocket', + 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native'] + + pre_install do |installer| + Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {} + installer.pod_targets.each do |pod| + if $static_framework.include?(pod.name) + def pod.build_type; + Pod::Target::BuildType.static_library + end + end + end + end + end +end + +# Post Install processing for Flipper +def flipper_post_install(installer) + 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 + end + app_project.save + end + installer.pods_project.save +end + target 'RNTester' do pods() + flipper_pods() end target 'RNTesterUnitTests' do @@ -39,6 +86,7 @@ target 'RNTesterIntegrationTests' do end post_install do |installer| + flipper_post_install(installer) installer.pods_project.targets.each do |target| puts target.name end diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 0f826653eec..7b116cad131 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -1,14 +1,60 @@ PODS: - boost-for-react-native (1.63.0) + - CocoaAsyncSocket (7.6.3) + - CocoaLibEvent (1.0.0) - DoubleConversion (1.1.6) - - FBLazyVector (1000.0.0) - - FBReactNativeSpec (1000.0.0): + - FBLazyVector (0.62.0-rc.1) + - FBReactNativeSpec (0.62.0-rc.1): - Folly (= 2018.10.22.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-Core (= 1000.0.0) - - React-jsi (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) + - RCTRequired (= 0.62.0-rc.1) + - RCTTypeSafety (= 0.62.0-rc.1) + - React-Core (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - Flipper (0.30.1): + - Flipper-Folly (~> 2.1) + - Flipper-RSocket (~> 1.0) + - Flipper-Folly (2.1.0): + - boost-for-react-native + - CocoaLibEvent (~> 1.0) + - DoubleConversion + - glog + - OpenSSL-Universal (= 1.0.2.19) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.0.0): + - Flipper-Folly (~> 2.0) + - FlipperKit (0.30.1): + - FlipperKit/Core (= 0.30.1) + - FlipperKit/Core (0.30.1): + - Flipper (~> 0.30.1) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - FlipperKit/CppBridge (0.30.1): + - Flipper (~> 0.30.1) + - FlipperKit/FBCxxFollyDynamicConvert (0.30.1): + - Flipper-Folly (~> 2.1) + - FlipperKit/FBDefines (0.30.1) + - FlipperKit/FKPortForwarding (0.30.1): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.30.1) + - FlipperKit/FlipperKitLayoutPlugin (0.30.1): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.30.1) + - FlipperKit/FlipperKitNetworkPlugin (0.30.1): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.30.1): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.30.1): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.30.1): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin - Folly (2018.10.22.00): - boost-for-react-native - DoubleConversion @@ -19,269 +65,279 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - RCTRequired (1000.0.0) - - RCTTypeSafety (1000.0.0): - - FBLazyVector (= 1000.0.0) + - OpenSSL-Universal (1.0.2.19): + - OpenSSL-Universal/Static (= 1.0.2.19) + - OpenSSL-Universal/Static (1.0.2.19) + - RCTRequired (0.62.0-rc.1) + - RCTTypeSafety (0.62.0-rc.1): + - FBLazyVector (= 0.62.0-rc.1) - Folly (= 2018.10.22.00) - - RCTRequired (= 1000.0.0) - - React-Core (= 1000.0.0) - - React (1000.0.0): - - React-Core (= 1000.0.0) - - React-Core/DevSupport (= 1000.0.0) - - React-Core/RCTWebSocket (= 1000.0.0) - - React-RCTActionSheet (= 1000.0.0) - - React-RCTAnimation (= 1000.0.0) - - React-RCTBlob (= 1000.0.0) - - React-RCTImage (= 1000.0.0) - - React-RCTLinking (= 1000.0.0) - - React-RCTNetwork (= 1000.0.0) - - React-RCTSettings (= 1000.0.0) - - React-RCTText (= 1000.0.0) - - React-RCTVibration (= 1000.0.0) - - React-ART (1000.0.0): - - React-Core/ARTHeaders (= 1000.0.0) - - React-Core (1000.0.0): + - RCTRequired (= 0.62.0-rc.1) + - React-Core (= 0.62.0-rc.1) + - React (0.62.0-rc.1): + - React-Core (= 0.62.0-rc.1) + - React-Core/DevSupport (= 0.62.0-rc.1) + - React-Core/RCTWebSocket (= 0.62.0-rc.1) + - React-RCTActionSheet (= 0.62.0-rc.1) + - React-RCTAnimation (= 0.62.0-rc.1) + - React-RCTBlob (= 0.62.0-rc.1) + - React-RCTImage (= 0.62.0-rc.1) + - React-RCTLinking (= 0.62.0-rc.1) + - React-RCTNetwork (= 0.62.0-rc.1) + - React-RCTSettings (= 0.62.0-rc.1) + - React-RCTText (= 0.62.0-rc.1) + - React-RCTVibration (= 0.62.0-rc.1) + - React-ART (0.62.0-rc.1): + - React-Core/ARTHeaders (= 0.62.0-rc.1) + - React-Core (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 1000.0.0) - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-Core/Default (= 0.62.0-rc.1) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/ARTHeaders (1000.0.0): + - React-Core/ARTHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/CoreModulesHeaders (1000.0.0): + - React-Core/CoreModulesHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/Default (1000.0.0): + - React-Core/Default (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/DevSupport (1000.0.0): + - React-Core/DevSupport (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 1000.0.0) - - React-Core/RCTWebSocket (= 1000.0.0) - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - React-jsinspector (= 1000.0.0) + - React-Core/Default (= 0.62.0-rc.1) + - React-Core/RCTWebSocket (= 0.62.0-rc.1) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) + - React-jsinspector (= 0.62.0-rc.1) - Yoga - - React-Core/RCTActionSheetHeaders (1000.0.0): + - React-Core/RCTActionSheetHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTAnimationHeaders (1000.0.0): + - React-Core/RCTAnimationHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTBlobHeaders (1000.0.0): + - React-Core/RCTBlobHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTImageHeaders (1000.0.0): + - React-Core/RCTImageHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTLinkingHeaders (1000.0.0): + - React-Core/RCTLinkingHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTNetworkHeaders (1000.0.0): + - React-Core/RCTNetworkHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTPushNotificationHeaders (1000.0.0): + - React-Core/RCTPushNotificationHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTSettingsHeaders (1000.0.0): + - React-Core/RCTSettingsHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTTextHeaders (1000.0.0): + - React-Core/RCTTextHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTVibrationHeaders (1000.0.0): + - React-Core/RCTVibrationHeaders (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-Core/RCTWebSocket (1000.0.0): + - React-Core/RCTWebSocket (0.62.0-rc.1): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 1000.0.0) - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) + - React-Core/Default (= 0.62.0-rc.1) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsiexecutor (= 0.62.0-rc.1) - Yoga - - React-CoreModules (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) + - React-CoreModules (0.62.0-rc.1): + - FBReactNativeSpec (= 0.62.0-rc.1) - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 1000.0.0) - - React-Core/CoreModulesHeaders (= 1000.0.0) - - React-RCTImage (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-cxxreact (1000.0.0): + - RCTTypeSafety (= 0.62.0-rc.1) + - React-Core/CoreModulesHeaders (= 0.62.0-rc.1) + - React-RCTImage (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - React-cxxreact (0.62.0-rc.1): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsinspector (= 1000.0.0) - - React-jsi (1000.0.0): + - React-jsinspector (= 0.62.0-rc.1) + - React-jsi (0.62.0-rc.1): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsi/Default (= 1000.0.0) - - React-jsi/Default (1000.0.0): + - React-jsi/Default (= 0.62.0-rc.1) + - React-jsi/Default (0.62.0-rc.1): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsiexecutor (1000.0.0): + - React-jsiexecutor (0.62.0-rc.1): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsinspector (1000.0.0) - - React-RCTActionSheet (1000.0.0): - - React-Core/RCTActionSheetHeaders (= 1000.0.0) - - React-RCTAnimation (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-jsinspector (0.62.0-rc.1) + - React-RCTActionSheet (0.62.0-rc.1): + - React-Core/RCTActionSheetHeaders (= 0.62.0-rc.1) + - React-RCTAnimation (0.62.0-rc.1): + - FBReactNativeSpec (= 0.62.0-rc.1) - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 1000.0.0) - - React-Core/RCTAnimationHeaders (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-RCTBlob (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) + - RCTTypeSafety (= 0.62.0-rc.1) + - React-Core/RCTAnimationHeaders (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - React-RCTBlob (0.62.0-rc.1): + - FBReactNativeSpec (= 0.62.0-rc.1) - Folly (= 2018.10.22.00) - - React-Core/RCTBlobHeaders (= 1000.0.0) - - React-Core/RCTWebSocket (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-RCTNetwork (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-RCTImage (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) + - React-Core/RCTBlobHeaders (= 0.62.0-rc.1) + - React-Core/RCTWebSocket (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - React-RCTNetwork (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - React-RCTImage (0.62.0-rc.1): + - FBReactNativeSpec (= 0.62.0-rc.1) - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 1000.0.0) - - React-Core/RCTImageHeaders (= 1000.0.0) - - React-RCTNetwork (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-RCTLinking (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) - - React-Core/RCTLinkingHeaders (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-RCTNetwork (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) + - RCTTypeSafety (= 0.62.0-rc.1) + - React-Core/RCTImageHeaders (= 0.62.0-rc.1) + - React-RCTNetwork (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - React-RCTLinking (0.62.0-rc.1): + - FBReactNativeSpec (= 0.62.0-rc.1) + - React-Core/RCTLinkingHeaders (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - React-RCTNetwork (0.62.0-rc.1): + - FBReactNativeSpec (= 0.62.0-rc.1) - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 1000.0.0) - - React-Core/RCTNetworkHeaders (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-RCTPushNotification (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-Core/RCTPushNotificationHeaders (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-RCTSettings (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) + - RCTTypeSafety (= 0.62.0-rc.1) + - React-Core/RCTNetworkHeaders (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - React-RCTPushNotification (0.62.0-rc.1): + - FBReactNativeSpec (= 0.62.0-rc.1) + - RCTTypeSafety (= 0.62.0-rc.1) + - React-Core/RCTPushNotificationHeaders (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - React-RCTSettings (0.62.0-rc.1): + - FBReactNativeSpec (= 0.62.0-rc.1) - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 1000.0.0) - - React-Core/RCTSettingsHeaders (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-RCTTest (1000.0.0): - - React-Core (= 1000.0.0) - - React-CoreModules (= 1000.0.0) - - React-RCTText (1000.0.0): - - React-Core/RCTTextHeaders (= 1000.0.0) - - React-RCTVibration (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) + - RCTTypeSafety (= 0.62.0-rc.1) + - React-Core/RCTSettingsHeaders (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - React-RCTTest (0.62.0-rc.1): + - React-Core (= 0.62.0-rc.1) + - React-CoreModules (= 0.62.0-rc.1) + - React-RCTText (0.62.0-rc.1): + - React-Core/RCTTextHeaders (= 0.62.0-rc.1) + - React-RCTVibration (0.62.0-rc.1): + - FBReactNativeSpec (= 0.62.0-rc.1) - Folly (= 2018.10.22.00) - - React-Core/RCTVibrationHeaders (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - - ReactCommon/callinvoker (1000.0.0): + - React-Core/RCTVibrationHeaders (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) + - ReactCommon/callinvoker (0.62.0-rc.1): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 1000.0.0) - - ReactCommon/turbomodule/core (1000.0.0): + - React-cxxreact (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (0.62.0-rc.1): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-Core (= 1000.0.0) - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - ReactCommon/callinvoker (= 1000.0.0) - - ReactCommon/turbomodule/samples (1000.0.0): + - React-Core (= 0.62.0-rc.1) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - ReactCommon/callinvoker (= 0.62.0-rc.1) + - ReactCommon/turbomodule/samples (0.62.0-rc.1): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-Core (= 1000.0.0) - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - ReactCommon/callinvoker (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Core (= 0.62.0-rc.1) + - React-cxxreact (= 0.62.0-rc.1) + - React-jsi (= 0.62.0-rc.1) + - ReactCommon/callinvoker (= 0.62.0-rc.1) + - ReactCommon/turbomodule/core (= 0.62.0-rc.1) - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) DEPENDENCIES: - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../Libraries/FBLazyVector`) - FBReactNativeSpec (from `../Libraries/FBReactNativeSpec`) + - FlipperKit (~> 0.30.1) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.30.1) + - FlipperKit/FlipperKitReactPlugin (~> 0.30.1) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.30.1) + - FlipperKit/SKIOSNetworkPlugin (~> 0.30.1) - Folly (from `../third-party-podspecs/Folly.podspec`) - glog (from `../third-party-podspecs/glog.podspec`) - RCTRequired (from `../Libraries/RCTRequired`) @@ -313,8 +369,17 @@ DEPENDENCIES: - Yoga (from `../ReactCommon/yoga`) SPEC REPOS: - trunk: + https://cdn.cocoapods.org/: - boost-for-react-native + - CocoaAsyncSocket + - CocoaLibEvent + - Flipper + - Flipper-Folly + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit + - OpenSSL-Universal + - YogaKit EXTERNAL SOURCES: DoubleConversion: @@ -376,35 +441,44 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - FBLazyVector: 34431b7e61740bed29b082ff81500b0ffafaffa0 - FBReactNativeSpec: e9febd2d5cc091662f172724165922b2e28d10a3 + CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987 + CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f + DoubleConversion: cde416483dac037923206447da6e1454df403714 + FBLazyVector: 9349d70d60793fce157f7c3837f51c60bc81a91b + FBReactNativeSpec: 36215b34017aa3bb62f1ed494b50fbaa242649fb + Flipper: d591b88245dc8c8147819aa249f911923c7417fc + Flipper-Folly: bcae82405dafd18ac9f8d9d4902fd1c2ef2a7e77 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 + FlipperKit: 3e13631bca7c5ec0dd54ee1d096f5e5d32a5d784 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 - glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - RCTRequired: 33f3b89d2d82ef01c02b9b4f8146c43762e509d8 - RCTTypeSafety: 2b1cb2d92b779aa9a3522f67bd4f07e6b6d0797e - React: 28a654b69575941571c073a656bc06795825e7f7 - React-ART: a5da06a892342d03896e0db45a7072525981f63c - React-Core: f8656b21cfe16b1fe276686f3b921bce0fa6de4d - React-CoreModules: 96b2f1e0b84493e6c1b7f3bb21357f24fdcfce2f - React-cxxreact: 7c4242192149ce0205b53efaa03e3bf86ba4337c - React-jsi: 98d1f9d8a79d2720ba6a44c2d928a77f315b7e4f - React-jsiexecutor: c0ab8c80a6e88380d63f583690a50d4a723b47b5 - React-jsinspector: ea0a218071a11c3687cef2480580180caa6a64c0 - React-RCTActionSheet: 090e7bd7c5774d919c47c4eeff78223a7fd8c19c - React-RCTAnimation: 891c2b3404c214dc19faee57b5f249da6deeb099 - React-RCTBlob: 8df793b30385b7ffe7e6703651043bad369cd756 - React-RCTImage: 3ee9a6cd02c7741ebe3a001d51a18c349019778f - React-RCTLinking: 7ccb8f6dcfd4b95b68a73119aca7bca9fa530b08 - React-RCTNetwork: 565fa6cc6108db9210fe5774f04ce52edccbb8ed - React-RCTPushNotification: 494ccfc569e2a699c0cc1a816eaebf8197a2ebc8 - React-RCTSettings: 8138286da8de74839cb436dd37704ed64d4bfe78 - React-RCTTest: d148e0657ce77ffd43a10325c284f47f25fb0532 - React-RCTText: 9078167d3bc011162326f2d8ef4dd580ec1eca17 - React-RCTVibration: e3269787c533de8c4f54f489202d848fdef33e1d - ReactCommon: 9d212865526209dc2d01be40340c8d27b53e6bea - Yoga: d88d8b51ee5b247f43211e2edf272438df1b484f + glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 + OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 + RCTRequired: 418abaf045a635a391e68ee0573035553c1c4d7b + RCTTypeSafety: ea8dd81f61436a394b943dac4435a304c59906ff + React: f591e8a044a8ee4a4b20ab632b2906461a241370 + React-ART: 11785e335a25cc0397fcd008cd0f8e0d340340f0 + React-Core: 0bb33e607db817c4f60c967448c16f7d31bb973b + React-CoreModules: 15064232a166bf4408d0a723a739815c317635be + React-cxxreact: dc7b272c44c80616385c25242f54f8594951b57f + React-jsi: e3f33d91999ba00d787ceceb6783aa314ecf175d + React-jsiexecutor: ccf2361cd90f691e04ff73585f099aa179ae8b52 + React-jsinspector: fabb3a8cad7bce396f2d4c29cbf83e87022b07ec + React-RCTActionSheet: a9a397cdf75149175eab539e536eeb42518f529c + React-RCTAnimation: 3fddf9e5dc82ea620c1c44b4206149688b43e054 + React-RCTBlob: 245f8f0b4578bbecff5e99062f8e2db580218434 + React-RCTImage: 8205ce960be3d68fcb8dbab729761d828223cd39 + React-RCTLinking: 27d5e8256b0656d87a00b41af6e55155a70e349b + React-RCTNetwork: c6a346f734121eecc855aaaed4572883f502978d + React-RCTPushNotification: 658436eec8559a1248c3b859246012e859fadefd + React-RCTSettings: 9ae19dc86054cf5317086ab302e820e9616da193 + React-RCTTest: 399480c8fcfacba1b3e6c0af6fced4f24d62e2da + React-RCTText: f2f9976b77661b5a1d628cf7ebfe6c08b6168f8a + React-RCTVibration: 2e7618e869b2ba4a15042d6def29dd32df734793 + ReactCommon: 13c3473a975e73db91b1999e0d6d89c62400785d + Yoga: b9a1f7189009fa4b6266ee0a63235547326295d2 + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 060903e270072f1e192b064848e6c34528af1c87 +PODFILE CHECKSUM: 6c950c0173bc4754b0d9fa5aba9232943ac228b4 COCOAPODS: 1.8.4 diff --git a/RNTester/RNTester/AppDelegate.mm b/RNTester/RNTester/AppDelegate.mm index 2819b4a42f1..e23a1a6f367 100644 --- a/RNTester/RNTester/AppDelegate.mm +++ b/RNTester/RNTester/AppDelegate.mm @@ -33,6 +33,19 @@ #import #endif + +#if DEBUG +#ifdef FB_SONARKIT_ENABLED +#import +#import +#import +#import +#import +#import +#import +#endif +#endif + #import #import "RNTesterTurboModuleProvider.h" @@ -83,6 +96,7 @@ rootViewController.view = rootView; self.window.rootViewController = rootViewController; [self.window makeKeyAndVisible]; + [self initializeFlipper:application]; return YES; } @@ -94,6 +108,22 @@ fallbackResource:nil]; } +- (void)initializeFlipper:(UIApplication *)application +{ +#if DEBUG +#ifdef FB_SONARKIT_ENABLED + 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 +#endif +} + - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options diff --git a/RNTester/RNTesterPods.xcodeproj/project.pbxproj b/RNTester/RNTesterPods.xcodeproj/project.pbxproj index 470332d3f69..1ac0232e7a2 100644 --- a/RNTester/RNTesterPods.xcodeproj/project.pbxproj +++ b/RNTester/RNTesterPods.xcodeproj/project.pbxproj @@ -13,11 +13,11 @@ 27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; }; 2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; }; 3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; }; - 42C7FD8921D436BBA216216D /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA4C77A9826FF02A56911142 /* libPods-RNTester.a */; }; + 442B673CCEF28320AE16877B /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3C8BDC1E54DFC8EB0F67828 /* libPods-RNTester.a */; }; 5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C60EB1B226440DB0018C04F /* AppDelegate.mm */; }; 5CB07C9B226467E60039471C /* RNTesterTurboModuleProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */; }; - 69B65AC442B001534251D909 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BBFF3E3792E27C4FBA2CB43 /* libPods-RNTesterIntegrationTests.a */; }; - C23B0809CAE8A115772B092E /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A6C306038665FDDA3E54E2 /* libPods-RNTesterUnitTests.a */; }; + AB71F075B51B1FA0C65DCF39 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2723489EF058D50FF7217FD9 /* libPods-RNTesterUnitTests.a */; }; + CBC719CA19D2FD9247BD28F1 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67373A0E14C242E758EE729F /* libPods-RNTesterIntegrationTests.a */; }; E7C1241A22BEC44B00DA25C0 /* RNTesterIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */; }; E7DB20D122B2BAA6005AC45F /* RCTBundleURLProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20A922B2BAA3005AC45F /* RCTBundleURLProviderTests.m */; }; E7DB20D222B2BAA6005AC45F /* RCTModuleInitNotificationRaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20AA22B2BAA3005AC45F /* RCTModuleInitNotificationRaceTests.m */; }; @@ -74,6 +74,7 @@ 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RNTester/main.m; sourceTree = ""; }; + 2723489EF058D50FF7217FD9 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 272E6B3B1BEA849E001FCF37 /* UpdatePropertiesExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePropertiesExampleView.h; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.h; sourceTree = ""; }; 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePropertiesExampleView.m; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.m; sourceTree = ""; }; 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FlexibleSizeExampleView.m; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.m; sourceTree = ""; }; @@ -81,15 +82,15 @@ 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RNTester/Images.xcassets; sourceTree = ""; }; 34028D6B10F47E490042EB27 /* Pods-RNTesterUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.debug.xcconfig"; sourceTree = ""; }; 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "legacy_image@2x.png"; path = "RNTester/legacy_image@2x.png"; sourceTree = ""; }; - 42A6C306038665FDDA3E54E2 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5BBFF3E3792E27C4FBA2CB43 /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 5BEC8567F3741044B6A5EFC5 /* Pods-RNTester.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester/Pods-RNTester.release.xcconfig"; sourceTree = ""; }; 5C60EB1B226440DB0018C04F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = RNTester/AppDelegate.mm; sourceTree = ""; }; 5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RNTesterTurboModuleProvider.mm; path = RNTester/RNTesterTurboModuleProvider.mm; sourceTree = ""; }; 5CB07C9A226467E60039471C /* RNTesterTurboModuleProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNTesterTurboModuleProvider.h; path = RNTester/RNTesterTurboModuleProvider.h; sourceTree = ""; }; + 67373A0E14C242E758EE729F /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 7D51F73F0DA20287418D98BD /* Pods-RNTesterIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig"; sourceTree = ""; }; 972A459EE6CF8CC63531A088 /* Pods-RNTesterIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.debug.xcconfig"; sourceTree = ""; }; 98233960D1D6A1977D1C7EAF /* Pods-RNTester.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester/Pods-RNTester.debug.xcconfig"; sourceTree = ""; }; + D3C8BDC1E54DFC8EB0F67828 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E771AEEA22B44E3100EA1189 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = ""; }; E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterIntegrationTests.m; sourceTree = ""; }; E7DB209F22B2BA84005AC45F /* RNTesterUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNTesterUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -163,7 +164,6 @@ E7DB216122B2F3EC005AC45F /* RCTRootViewIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRootViewIntegrationTests.m; sourceTree = ""; }; E7DB218B22B41FCD005AC45F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; E9618482EC8608D4872A6E28 /* Pods-RNTesterUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig"; sourceTree = ""; }; - EA4C77A9826FF02A56911142 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -171,7 +171,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 42C7FD8921D436BBA216216D /* libPods-RNTester.a in Frameworks */, + 442B673CCEF28320AE16877B /* libPods-RNTester.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -181,7 +181,7 @@ files = ( E7DB213122B2C649005AC45F /* JavaScriptCore.framework in Frameworks */, E7DB213222B2C67D005AC45F /* libOCMock.a in Frameworks */, - C23B0809CAE8A115772B092E /* libPods-RNTesterUnitTests.a in Frameworks */, + AB71F075B51B1FA0C65DCF39 /* libPods-RNTesterUnitTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -191,7 +191,7 @@ files = ( E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */, E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */, - 69B65AC442B001534251D909 /* libPods-RNTesterIntegrationTests.a in Frameworks */, + CBC719CA19D2FD9247BD28F1 /* libPods-RNTesterIntegrationTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -261,9 +261,9 @@ E7DB211822B2BD53005AC45F /* libReact-RCTText.a */, E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */, E7DB212222B2BD53005AC45F /* libyoga.a */, - EA4C77A9826FF02A56911142 /* libPods-RNTester.a */, - 5BBFF3E3792E27C4FBA2CB43 /* libPods-RNTesterIntegrationTests.a */, - 42A6C306038665FDDA3E54E2 /* libPods-RNTesterUnitTests.a */, + D3C8BDC1E54DFC8EB0F67828 /* libPods-RNTester.a */, + 67373A0E14C242E758EE729F /* libPods-RNTesterIntegrationTests.a */, + 2723489EF058D50FF7217FD9 /* libPods-RNTesterUnitTests.a */, ); name = Frameworks; sourceTree = ""; @@ -725,8 +725,20 @@ ); INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - OTHER_CFLAGS = "$(inherited)"; + LD_RUNPATH_SEARCH_PATHS = ( + /usr/lib/swift, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)", + "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)", + ); + "LIBRARY_SEARCH_PATHS[arch=*]" = "$(inherited)"; + OTHER_CFLAGS = ( + "$(inherited)", + "-DFB_SONARKIT_ENABLED=1", + ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -779,8 +791,19 @@ ); INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - OTHER_CFLAGS = "$(inherited)"; + LD_RUNPATH_SEARCH_PATHS = ( + /usr/lib/swift, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)", + "$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)", + ); + OTHER_CFLAGS = ( + "$(inherited)", + "-DFB_SONARKIT_ENABLED=1", + ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -974,6 +997,10 @@ ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; + OTHER_CFLAGS = ( + "$(inherited)", + "-DFB_SONARKIT_ENABLED=1", + ); PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1005,6 +1032,10 @@ "$(PROJECT_DIR)/RNTesterUnitTests", ); MTL_FAST_MATH = YES; + OTHER_CFLAGS = ( + "$(inherited)", + "-DFB_SONARKIT_ENABLED=1", + ); PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1037,6 +1068,10 @@ ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; + OTHER_CFLAGS = ( + "$(inherited)", + "-DFB_SONARKIT_ENABLED=1", + ); PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterIntegrationTests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1066,6 +1101,10 @@ "@loader_path/Frameworks", ); MTL_FAST_MATH = YES; + OTHER_CFLAGS = ( + "$(inherited)", + "-DFB_SONARKIT_ENABLED=1", + ); PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterIntegrationTests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2";