From b1b2b8baafa5a221115a23b89cb77a230846c1d0 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Mon, 20 Feb 2023 11:50:10 -0800 Subject: [PATCH] Update podspecs with the right search paths Summary: Update podspecs with the right search paths to include the required framework by every module. ## Changelog: [iOS][Changed] - Update search paths to support `use_frameworks!` with Fabric Reviewed By: sammy-SC, dmytrorykun Differential Revision: D43089372 fbshipit-source-id: 4bbfc4b98bd289d66ce4015429d581856d9c05b3 --- .../AppDelegate/React-RCTAppDelegate.podspec | 7 ++ Libraries/Blob/React-RCTBlob.podspec | 15 +++- Libraries/Image/React-RCTImage.podspec | 15 +++- Libraries/LinkingIOS/React-RCTLinking.podspec | 15 +++- .../React-RCTAnimation.podspec | 15 +++- Libraries/Network/React-RCTNetwork.podspec | 15 +++- .../React-RCTPushNotification.podspec | 15 +++- Libraries/Settings/React-RCTSettings.podspec | 15 +++- .../Vibration/React-RCTVibration.podspec | 15 +++- React-Core.podspec | 15 +++- React/CoreModules/React-CoreModules.podspec | 14 +++- React/React-RCTFabric.podspec | 28 +++++++- ReactCommon/React-Fabric.podspec | 70 ++++++++++--------- ReactCommon/ReactCommon.podspec | 3 + .../renderer/graphics/React-graphics.podspec | 19 ++++- 15 files changed, 225 insertions(+), 51 deletions(-) diff --git a/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/Libraries/AppDelegate/React-RCTAppDelegate.podspec index bf6c9b5787..763ae2d987 100644 --- a/Libraries/AppDelegate/React-RCTAppDelegate.podspec +++ b/Libraries/AppDelegate/React-RCTAppDelegate.podspec @@ -24,6 +24,7 @@ is_new_arch_enabled = ENV[new_arch_enabled_flag] == "1" other_cflags = "$(inherited) -DRN_FABRIC_ENABLED " + folly_flags + (is_new_arch_enabled ? " -D"+"RCT_NEW_ARCH_ENABLED" : "") use_hermes = ENV['USE_HERMES'] == '1' +use_frameworks = ENV['USE_FRAMEWORKS'] != nil header_search_paths = [ "$(PODS_TARGET_SRCROOT)/ReactCommon", @@ -37,6 +38,12 @@ header_search_paths = [ ].concat(use_hermes ? [ "$(PODS_ROOT)/Headers/Public/React-hermes", "$(PODS_ROOT)/Headers/Public/hermes-engine" +] : []).concat(use_frameworks ? [ + "$(PODS_CONFIGURATION_BUILD_DIR)/React-Fabric/React_Fabric.framework/Headers/", + "$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/", + "$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", + "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", + "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios" ] : []).map{|p| "\"#{p}\""}.join(" ") Pod::Spec.new do |s| diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec index b3a557dbae..478e88ac11 100644 --- a/Libraries/Blob/React-RCTBlob.podspec +++ b/Libraries/Blob/React-RCTBlob.podspec @@ -19,6 +19,19 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' +header_search_paths = [ + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" +] + +if ENV["USE_FRAMEWORKS"] + header_search_paths = header_search_paths.concat([ + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios\"" + ]) +end + Pod::Spec.new do |s| s.name = "React-RCTBlob" s.version = version @@ -35,7 +48,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.dependency "RCT-Folly", folly_version diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec index 5eb0fdbcf7..8d8b944500 100644 --- a/Libraries/Image/React-RCTImage.podspec +++ b/Libraries/Image/React-RCTImage.podspec @@ -19,6 +19,19 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' +header_search_paths = [ + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" +] + +if ENV["USE_FRAMEWORKS"] + header_search_paths = header_search_paths.concat([ + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios\"" + ]) +end + Pod::Spec.new do |s| s.name = "React-RCTImage" s.version = version @@ -36,7 +49,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.dependency "RCT-Folly", folly_version diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec index c975d321ee..ebe116458f 100644 --- a/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -19,6 +19,19 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' +header_search_paths = [ + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" +] + +if ENV["USE_FRAMEWORKS"] + header_search_paths = header_search_paths.concat([ + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios\"" + ]) +end + Pod::Spec.new do |s| s.name = "React-RCTLinking" s.version = version @@ -36,7 +49,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.dependency "React-Codegen", version diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec index a1e4126d4c..2b56669e2e 100644 --- a/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -19,6 +19,19 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' +header_search_paths = [ + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" +] + +if ENV["USE_FRAMEWORKS"] + header_search_paths = header_search_paths.concat([ + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios\"" + ]) +end + Pod::Spec.new do |s| s.name = "React-RCTAnimation" s.version = version @@ -35,7 +48,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + "HEADER_SEARCH_PATHS" => header_search_paths.join(" ") } s.dependency "RCT-Folly", folly_version diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec index 6b57d3c3d0..0a062da6d2 100644 --- a/Libraries/Network/React-RCTNetwork.podspec +++ b/Libraries/Network/React-RCTNetwork.podspec @@ -19,6 +19,19 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' +header_search_paths = [ + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" +] + +if ENV["USE_FRAMEWORKS"] + header_search_paths = header_search_paths.concat([ + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios\"" + ]) +end + Pod::Spec.new do |s| s.name = "React-RCTNetwork" s.version = version @@ -35,7 +48,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.frameworks = "MobileCoreServices" diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index ce1f9da25f..fa35dd9ead 100644 --- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -19,6 +19,19 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' +header_search_paths = [ + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" +] + +if ENV["USE_FRAMEWORKS"] + header_search_paths = header_search_paths.concat([ + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios\"" + ]) +end + Pod::Spec.new do |s| s.name = "React-RCTPushNotification" s.version = version @@ -36,7 +49,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.framework = "UserNotifications" diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec index c721a57367..0ad2170b75 100644 --- a/Libraries/Settings/React-RCTSettings.podspec +++ b/Libraries/Settings/React-RCTSettings.podspec @@ -19,6 +19,19 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' +header_search_paths = [ + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" +] + +if ENV["USE_FRAMEWORKS"] + header_search_paths = header_search_paths.concat([ + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios\"" + ]) +end + Pod::Spec.new do |s| s.name = "React-RCTSettings" s.version = version @@ -36,7 +49,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.dependency "RCT-Folly", folly_version diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec index 90ec1a6f0f..87dd34c4fa 100644 --- a/Libraries/Vibration/React-RCTVibration.podspec +++ b/Libraries/Vibration/React-RCTVibration.podspec @@ -19,6 +19,19 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' +header_search_paths = [ + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" +] + +if ENV["USE_FRAMEWORKS"] + header_search_paths = header_search_paths.concat([ + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios\"" + ]) +end + Pod::Spec.new do |s| s.name = "React-RCTVibration" s.version = version @@ -36,7 +49,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.frameworks = "AudioToolbox" diff --git a/React-Core.podspec b/React-Core.podspec index 31db1b23d9..b118716fbc 100644 --- a/React-Core.podspec +++ b/React-Core.podspec @@ -21,6 +21,7 @@ folly_version = '2021.07.22.00' boost_compiler_flags = '-Wno-documentation' use_hermes = ENV['USE_HERMES'] == '1' +use_frameworks = ENV['USE_FRAMEWORKS'] != nil header_subspecs = { 'CoreModulesHeaders' => 'React/CoreModules/**/*.h', @@ -36,6 +37,11 @@ header_subspecs = { 'RCTVibrationHeaders' => 'Libraries/Vibration/*.h', } +frameworks_search_paths = [] +frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-hermes\"" if use_hermes +frameworks_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon\"" if use_frameworks +frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric\"" if use_frameworks + header_search_paths = [ "$(PODS_TARGET_SRCROOT)/ReactCommon", "$(PODS_ROOT)/boost", @@ -47,6 +53,10 @@ header_search_paths = [ ].concat(use_hermes ? [ "$(PODS_ROOT)/Headers/Public/React-hermes", "$(PODS_ROOT)/Headers/Public/hermes-engine" +] : []).concat(use_frameworks ? [ + "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers", + "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", + "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios" ] : []).map{|p| "\"#{p}\""}.join(" ") Pod::Spec.new do |s| @@ -67,9 +77,8 @@ Pod::Spec.new do |s| "DEFINES_MODULE" => "YES", "GCC_PREPROCESSOR_DEFINITIONS" => "RCT_METRO_PORT=${RCT_METRO_PORT}", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - }.merge!(use_hermes ? { - "FRAMEWORK_SEARCH_PATHS" => "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-hermes\"" - } : {}) + "FRAMEWORK_SEARCH_PATHS" => frameworks_search_paths.join(" ") + } s.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""} s.default_subspec = "Default" diff --git a/React/CoreModules/React-CoreModules.podspec b/React/CoreModules/React-CoreModules.podspec index 89f79da17b..0b8d2a54a6 100644 --- a/React/CoreModules/React-CoreModules.podspec +++ b/React/CoreModules/React-CoreModules.podspec @@ -19,6 +19,18 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' +header_search_paths = [ + "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\"", + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" +] + +if ENV['USE_FRAMEWORKS'] + header_search_paths.append("\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core/platform/ios\"") + header_search_paths.append("\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"") +end + Pod::Spec.new do |s| s.name = "React-CoreModules" s.version = version @@ -34,7 +46,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + "HEADER_SEARCH_PATHS" => header_search_paths.join(" ") } s.dependency "React-Codegen", version diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec index 8855651666..abbba8e565 100644 --- a/React/React-RCTFabric.podspec +++ b/React/React-RCTFabric.podspec @@ -21,6 +21,26 @@ folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32' folly_version = '2021.07.22.00' boost_compiler_flags = '-Wno-documentation' +header_search_paths = [ + "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"", + "\"$(PODS_ROOT)/boost\"", + "\"$(PODS_ROOT)/DoubleConversion\"", + "\"$(PODS_ROOT)/RCT-Folly\"", + "\"$(PODS_ROOT)/Headers/Private/React-Core\"", + "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"", + +] + +if ENV['USE_FRAMEWORKS'] + header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\"" + header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/textlayoutmanager/platform/ios\"" + header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/textinput/iostextinput\"" + header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/imagemanager/platform/ios\"" + header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\"" + header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\"" +end + Pod::Spec.new do |s| s.name = "React-RCTFabric" s.version = version @@ -37,9 +57,11 @@ Pod::Spec.new do |s| s.header_dir = "React" s.module_name = "RCTFabric" s.framework = "JavaScriptCore" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-Codegen\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" } - s.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags } + s.pod_target_xcconfig = { + "HEADER_SEARCH_PATHS" => header_search_paths, + "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags, + "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" + } s.dependency "React-Core", version s.dependency "React-Fabric", version diff --git a/ReactCommon/React-Fabric.podspec b/ReactCommon/React-Fabric.podspec index c2cc021ce8..773e2c9464 100644 --- a/ReactCommon/React-Fabric.podspec +++ b/ReactCommon/React-Fabric.podspec @@ -35,6 +35,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } + if ENV['USE_FRAMEWORKS'] + s.header_mappings_dir = './' + s.module_name = 'React_Fabric' + end + s.dependency folly_dep_name, folly_version s.dependency "React-graphics", version s.dependency "React-jsiexecutor", version @@ -49,7 +54,6 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/animations/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/animations/tests" ss.header_dir = "react/renderer/animations" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "attributedstring" do |ss| @@ -58,7 +62,6 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/attributedstring/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/attributedstring/tests" ss.header_dir = "react/renderer/attributedstring" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "butter" do |ss| @@ -67,22 +70,39 @@ Pod::Spec.new do |s| ss.source_files = "butter/**/*.{m,mm,cpp,h}" ss.exclude_files = "butter/tests" ss.header_dir = "butter" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "config" do |ss| ss.source_files = "react/config/*.{m,mm,cpp,h}" ss.header_dir = "react/config" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" } end s.subspec "core" do |ss| + header_search_path = [ + "\"$(PODS_ROOT)/boost\"", + "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"", + "\"$(PODS_ROOT)/RCT-Folly\"" + ] + + if ENV['USE_FRAMEWORKS'] + header_search_path = header_search_path + [ + "\"$(PODS_TARGET_SRCROOT)\"", + "\"$(PODS_ROOT)/DoubleConversion\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\"", + "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\"", + "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"", + "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/iostextinput\"" + ] + end + ss.dependency folly_dep_name, folly_version ss.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags ss.source_files = "react/renderer/core/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/core/tests" ss.header_dir = "react/renderer/core" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + ss.pod_target_xcconfig = { + "HEADER_SEARCH_PATHS" => header_search_path.join(" ") + } end s.subspec "componentregistry" do |ss| @@ -90,7 +110,6 @@ Pod::Spec.new do |s| ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/componentregistry/**/*.{m,mm,cpp,h}" ss.header_dir = "react/renderer/componentregistry" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "componentregistrynative" do |ss| @@ -98,7 +117,6 @@ Pod::Spec.new do |s| ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/componentregistry/native/**/*.{m,mm,cpp,h}" ss.header_dir = "react/renderer/componentregistry/native" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "components" do |ss| @@ -108,7 +126,6 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/activityindicator/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/activityindicator/tests" sss.header_dir = "react/renderer/components/activityindicator" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end ss.subspec "image" do |sss| @@ -117,7 +134,6 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/image/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/image/tests" sss.header_dir = "react/renderer/components/image" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end ss.subspec "inputaccessory" do |sss| @@ -126,7 +142,6 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/inputaccessory/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/inputaccessory/tests" sss.header_dir = "react/renderer/components/inputaccessory" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end ss.subspec "legacyviewmanagerinterop" do |sss| @@ -135,7 +150,7 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/legacyviewmanagerinterop/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/legacyviewmanagerinterop/tests" sss.header_dir = "react/renderer/components/legacyviewmanagerinterop" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\"" } + sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\"" } end ss.subspec "modal" do |sss| @@ -144,7 +159,6 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/modal/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/modal/tests" sss.header_dir = "react/renderer/components/modal" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end ss.subspec "root" do |sss| @@ -153,7 +167,7 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/root/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/root/tests" sss.header_dir = "react/renderer/components/root" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + end ss.subspec "safeareaview" do |sss| @@ -162,7 +176,7 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/safeareaview/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/safeareaview/tests" sss.header_dir = "react/renderer/components/safeareaview" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + end ss.subspec "scrollview" do |sss| @@ -171,7 +185,7 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/scrollview/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/scrollview/tests" sss.header_dir = "react/renderer/components/scrollview" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + end ss.subspec "text" do |sss| @@ -180,7 +194,7 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/text/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/text/tests" sss.header_dir = "react/renderer/components/text" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + end ss.subspec "textinput" do |sss| @@ -189,7 +203,7 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/textinput/iostextinput/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/textinput/iostextinput/tests" sss.header_dir = "react/renderer/components/iostextinput" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + end ss.subspec "unimplementedview" do |sss| @@ -198,7 +212,7 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/unimplementedview/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/unimplementedview/tests" sss.header_dir = "react/renderer/components/unimplementedview" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + end ss.subspec "view" do |sss| @@ -208,7 +222,7 @@ Pod::Spec.new do |s| sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/view/tests" sss.header_dir = "react/renderer/components/view" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + end end @@ -218,7 +232,6 @@ Pod::Spec.new do |s| ss.source_files = "react/debug/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/debug/tests" ss.header_dir = "react/debug" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "debug_renderer" do |ss| @@ -227,7 +240,6 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/debug/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/debug/tests" ss.header_dir = "react/renderer/debug" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "imagemanager" do |ss| @@ -239,7 +251,6 @@ Pod::Spec.new do |s| "react/renderer/imagemanager/platform/android", "react/renderer/imagemanager/platform/cxx" ss.header_dir = "react/renderer/imagemanager" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "mapbuffer" do |ss| @@ -248,7 +259,6 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/mapbuffer/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/mapbuffer/tests" ss.header_dir = "react/renderer/mapbuffer" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "mounting" do |ss| @@ -257,7 +267,6 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/mounting/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/mounting/tests" ss.header_dir = "react/renderer/mounting" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "scheduler" do |ss| @@ -265,7 +274,6 @@ Pod::Spec.new do |s| ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/scheduler/**/*.{m,mm,cpp,h}" ss.header_dir = "react/renderer/scheduler" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "templateprocessor" do |ss| @@ -274,7 +282,6 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/templateprocessor/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/templateprocessor/tests" ss.header_dir = "react/renderer/templateprocessor" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "textlayoutmanager" do |ss| @@ -287,7 +294,6 @@ Pod::Spec.new do |s| "react/renderer/textlayoutmanager/platform/android", "react/renderer/textlayoutmanager/platform/cxx" ss.header_dir = "react/renderer/textlayoutmanager" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "uimanager" do |ss| @@ -296,7 +302,6 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/uimanager/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/uimanager/tests" ss.header_dir = "react/renderer/uimanager" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } end s.subspec "telemetry" do |ss| @@ -305,7 +310,7 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/telemetry/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/telemetry/tests" ss.header_dir = "react/renderer/telemetry" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + end s.subspec "leakchecker" do |ss| @@ -314,8 +319,7 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/leakchecker/**/*.{cpp,h}" ss.exclude_files = "react/renderer/leakchecker/tests" ss.header_dir = "react/renderer/leakchecker" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"", - "GCC_WARN_PEDANTIC" => "YES" } + ss.pod_target_xcconfig = { "GCC_WARN_PEDANTIC" => "YES" } end s.subspec "runtimescheduler" do |ss| @@ -324,14 +328,12 @@ Pod::Spec.new do |s| ss.source_files = "react/renderer/runtimescheduler/**/*.{cpp,h}" ss.exclude_files = "react/renderer/runtimescheduler/tests" ss.header_dir = "react/renderer/runtimescheduler" - ss.pod_target_xcconfig = {"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"", - "GCC_WARN_PEDANTIC" => "YES" } + ss.pod_target_xcconfig = { "GCC_WARN_PEDANTIC" => "YES" } end s.subspec "utils" do |ss| ss.source_files = "react/utils/*.{m,mm,cpp,h}" ss.header_dir = "react/utils" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\""} end end diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec index da42436877..8969091249 100644 --- a/ReactCommon/ReactCommon.podspec +++ b/ReactCommon/ReactCommon.podspec @@ -36,6 +36,9 @@ Pod::Spec.new do |s| "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", "GCC_WARN_PEDANTIC" => "YES" } + if ENV['USE_FRAMEWORKS'] + s.header_mappings_dir = './' + end # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..." # Note: Update this only when ready to minimize breaking changes. diff --git a/ReactCommon/react/renderer/graphics/React-graphics.podspec b/ReactCommon/react/renderer/graphics/React-graphics.podspec index 8b2d2bf463..19cc4ea84a 100644 --- a/ReactCommon/react/renderer/graphics/React-graphics.podspec +++ b/ReactCommon/react/renderer/graphics/React-graphics.podspec @@ -21,6 +21,13 @@ folly_version = '2021.07.22.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| + source_files = "**/*.{m,mm,cpp,h}" + header_search_paths = [ + "\"$(PODS_ROOT)/boost\"", + "\"$(PODS_TARGET_SRCROOT)/../../../\"", + "\"$(PODS_ROOT)/RCT-Folly\"", + ] + s.name = "React-graphics" s.version = version s.summary = "Fabric for React Native." @@ -30,13 +37,21 @@ Pod::Spec.new do |s| s.platforms = { :ios => "12.4" } s.source = source s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.source_files = "**/*.{m,mm,cpp,h}" + s.source_files = source_files s.exclude_files = "tests", "platform/android", "platform/cxx" s.header_dir = "react/renderer/graphics" - s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/../../../\" \"$(PODS_ROOT)/RCT-Folly\"" } + if ENV['USE_FRAMEWORKS'] + s.module_name = "React_graphics" + s.header_mappings_dir = "../../.." + header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""] + end + + s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => header_search_paths.join(" ") } + + s.dependency "glog" s.dependency "RCT-Folly/Fabric", folly_version s.dependency "React-Core/Default", version end