diff --git a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec index 8ea8f304bc8..3b2fec41f4c 100644 --- a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec +++ b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec @@ -16,26 +16,17 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - is_new_arch_enabled = ENV["RCT_NEW_ARCH_ENABLED"] != "0" use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1' new_arch_enabled_flag = (is_new_arch_enabled ? " -DRCT_NEW_ARCH_ENABLED=1" : "") hermes_flag = (use_hermes ? " -DUSE_HERMES=1" : "") use_third_party_jsc_flag = ENV['USE_THIRD_PARTY_JSC'] == '1' ? " -DUSE_THIRD_PARTY_JSC=1" : "" -other_cflags = "$(inherited) " + folly_compiler_flags + new_arch_enabled_flag + hermes_flag + use_third_party_jsc_flag +other_cflags = "$(inherited) " + new_arch_enabled_flag + hermes_flag + use_third_party_jsc_flag header_search_paths = [ "$(PODS_TARGET_SRCROOT)/../../ReactCommon", "$(PODS_ROOT)/Headers/Private/React-Core", - "$(PODS_ROOT)/boost", - "$(PODS_ROOT)/DoubleConversion", - "$(PODS_ROOT)/fast_float/include", - "$(PODS_ROOT)/fmt/include", - "$(PODS_ROOT)/RCT-Folly", "${PODS_ROOT}/Headers/Public/FlipperKit", "$(PODS_ROOT)/Headers/Public/ReactCommon", "$(PODS_ROOT)/Headers/Public/React-RCTFabric", @@ -68,7 +59,6 @@ Pod::Spec.new do |s| s.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/Yoga\""} s.dependency "React-Core" - s.dependency "RCT-Folly", folly_version s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "React-RCTNetwork" @@ -93,4 +83,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-RCTRuntime", :framework_name => "RCTRuntime") depend_on_js_engine(s) + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/Libraries/Blob/React-RCTBlob.podspec b/packages/react-native/Libraries/Blob/React-RCTBlob.podspec index 66b19f0e95c..7c0f7cb12d2 100644 --- a/packages/react-native/Libraries/Blob/React-RCTBlob.podspec +++ b/packages/react-native/Libraries/Blob/React-RCTBlob.podspec @@ -16,16 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/boost\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -37,7 +28,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "*.{h,m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" @@ -48,10 +39,6 @@ Pod::Spec.new do |s| "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" - s.dependency "RCT-Folly", folly_version s.dependency "React-jsi" s.dependency "React-Core/RCTBlobHeaders" s.dependency "React-Core/RCTWebSocket" @@ -65,4 +52,6 @@ Pod::Spec.new do |s| if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1" s.dependency "hermes-engine" end + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/Libraries/Image/React-RCTImage.podspec b/packages/react-native/Libraries/Image/React-RCTImage.podspec index 5e9d333701a..1a248f697af 100644 --- a/packages/react-native/Libraries/Image/React-RCTImage.podspec +++ b/packages/react-native/Libraries/Image/React-RCTImage.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -35,7 +30,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" @@ -47,7 +42,6 @@ Pod::Spec.new do |s| } s.framework = ["Accelerate", "UIKit", "QuartzCore", "ImageIO", "CoreGraphics"] - s.dependency "RCT-Folly", folly_version s.dependency "RCTTypeSafety" s.dependency "React-jsi" s.dependency "React-Core/RCTImageHeaders" @@ -57,4 +51,5 @@ Pod::Spec.new do |s| add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec b/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec index c2120fd2d4a..aa1d0f6cf8d 100644 --- a/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -34,7 +29,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" diff --git a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec index 7143d45c72c..aa2d6f16cd6 100644 --- a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -33,7 +28,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "**/*.{h,m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" @@ -45,7 +40,6 @@ Pod::Spec.new do |s| } s.framework = ["UIKit", "QuartzCore"] - s.dependency "RCT-Folly", folly_version s.dependency "RCTTypeSafety" s.dependency "React-jsi" s.dependency "React-Core/RCTAnimationHeaders" @@ -53,4 +47,6 @@ Pod::Spec.new do |s| add_dependency(s, "React-RCTFBReactNativeSpec") add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/Libraries/Network/React-RCTNetwork.podspec b/packages/react-native/Libraries/Network/React-RCTNetwork.podspec index b3292864b2c..01d8f63168e 100644 --- a/packages/react-native/Libraries/Network/React-RCTNetwork.podspec +++ b/packages/react-native/Libraries/Network/React-RCTNetwork.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -33,7 +28,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" @@ -45,7 +40,6 @@ Pod::Spec.new do |s| } s.frameworks = "MobileCoreServices" - s.dependency "RCT-Folly", folly_version s.dependency "RCTTypeSafety" s.dependency "React-jsi" s.dependency "React-Core/RCTNetworkHeaders" @@ -53,4 +47,6 @@ Pod::Spec.new do |s| add_dependency(s, "React-RCTFBReactNativeSpec") add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"]) + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index 0ea9322132f..487566103e2 100644 --- a/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -34,7 +29,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" diff --git a/packages/react-native/Libraries/Settings/React-RCTSettings.podspec b/packages/react-native/Libraries/Settings/React-RCTSettings.podspec index b2a41b3d239..4e9771e79cd 100644 --- a/packages/react-native/Libraries/Settings/React-RCTSettings.podspec +++ b/packages/react-native/Libraries/Settings/React-RCTSettings.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -34,7 +29,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" @@ -45,7 +40,6 @@ Pod::Spec.new do |s| "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } - s.dependency "RCT-Folly", folly_version s.dependency "RCTTypeSafety" s.dependency "React-jsi" s.dependency "React-Core/RCTSettingsHeaders" @@ -53,4 +47,6 @@ Pod::Spec.new do |s| add_dependency(s, "React-RCTFBReactNativeSpec") add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"]) + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec b/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec index f54d4862c75..2bc967dd366 100644 --- a/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec +++ b/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -34,7 +29,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "*.{m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" @@ -46,11 +41,12 @@ Pod::Spec.new do |s| } s.frameworks = "AudioToolbox" - s.dependency "RCT-Folly", folly_version s.dependency "React-jsi" s.dependency "React-Core/RCTVibrationHeaders" add_dependency(s, "React-RCTFBReactNativeSpec") add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/React-Core.podspec b/packages/react-native/React-Core.podspec index 9cde8fe32c2..c1968fbfd8b 100644 --- a/packages/react-native/React-Core.podspec +++ b/packages/react-native/React-Core.podspec @@ -16,16 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - -socket_rocket_config = get_socket_rocket_config() -socket_rocket_version = socket_rocket_config[:version] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1' use_hermes_flag = use_hermes ? "-DUSE_HERMES=1" : "" use_third_party_jsc_flag = ENV['USE_THIRD_PARTY_JSC'] == '1' ? "-DUSE_THIRD_PARTY_JSC=1" : "" @@ -49,11 +39,6 @@ frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-hermes\"" if header_search_paths = [ "$(PODS_TARGET_SRCROOT)/ReactCommon", - "$(PODS_ROOT)/boost", - "$(PODS_ROOT)/DoubleConversion", - "$(PODS_ROOT)/fast_float/include", - "$(PODS_ROOT)/fmt/include", - "$(PODS_ROOT)/RCT-Folly", "${PODS_ROOT}/Headers/Public/FlipperKit", "$(PODS_ROOT)/Headers/Public/ReactCommon", ].concat(use_hermes ? [ @@ -71,7 +56,7 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.resource_bundle = { "RCTI18nStrings" => ["React/I18n/strings/*.lproj"]} - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + ' ' + use_hermes_flag + ' ' + use_third_party_jsc_flag + s.compiler_flags = use_hermes_flag + ' ' + use_third_party_jsc_flag s.header_dir = "React" s.weak_framework = "JavaScriptCore" s.pod_target_xcconfig = { @@ -97,7 +82,7 @@ Pod::Spec.new do |s| ] # If we are using Hermes (the default is use hermes, so USE_HERMES can be nil), we don't have jsc installed # So we have to exclude the JSCExecutorFactory - if use_hermes + if use_hermes exclude_files = exclude_files.append("React/CxxBridge/JSCExecutorFactory.{h,mm}") elsif ENV['USE_THIRD_PARTY_JSC'] == '1' exclude_files = exclude_files.append("React/CxxBridge/JSCExecutorFactory.{h,mm}") @@ -130,17 +115,14 @@ Pod::Spec.new do |s| end end - s.dependency "RCT-Folly", folly_version s.dependency "React-cxxreact" s.dependency "React-perflogger" s.dependency "React-jsi" s.dependency "React-jsiexecutor" s.dependency "React-utils" s.dependency "React-featureflags" - s.dependency "SocketRocket", socket_rocket_version s.dependency "React-runtimescheduler" s.dependency "Yoga" - s.dependency "glog" s.resource_bundles = {'React-Core_privacy' => 'React/Resources/PrivacyInfo.xcprivacy'} @@ -149,4 +131,5 @@ Pod::Spec.new do |s| add_dependency(s, "RCTDeprecation") depend_on_js_engine(s) + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/React/CoreModules/React-CoreModules.podspec b/packages/react-native/React/CoreModules/React-CoreModules.podspec index c51b6da05eb..19091ac082d 100644 --- a/packages/react-native/React/CoreModules/React-CoreModules.podspec +++ b/packages/react-native/React/CoreModules/React-CoreModules.podspec @@ -16,20 +16,8 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - -socket_rocket_config = get_socket_rocket_config() -socket_rocket_version = socket_rocket_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/boost\"", "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\"", - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -41,7 +29,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "**/*.{c,m,mm,cpp}" @@ -59,20 +47,17 @@ Pod::Spec.new do |s| "HEADER_SEARCH_PATHS" => header_search_paths.join(" ") } s.framework = "UIKit" - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" - s.dependency "RCT-Folly", folly_version s.dependency "RCTTypeSafety", version s.dependency "React-Core/CoreModulesHeaders", version s.dependency "React-RCTImage", version s.dependency "React-jsi", version s.dependency 'React-RCTBlob' - s.dependency "SocketRocket", socket_rocket_version add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern') add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing') add_dependency(s, "React-RCTFBReactNativeSpec") add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/React/React-RCTFBReactNativeSpec.podspec b/packages/react-native/React/React-RCTFBReactNativeSpec.podspec index 620b43c7c8f..a2a9b3de916 100644 --- a/packages/react-native/React/React-RCTFBReactNativeSpec.podspec +++ b/packages/react-native/React/React-RCTFBReactNativeSpec.podspec @@ -22,17 +22,8 @@ end module_name = "FBReactNativeSpec" header_dir = "FBReactNativeSpec" -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] new_arch_flags = ENV['RCT_NEW_ARCH_ENABLED'] == '1' ? ' -DRCT_NEW_ARCH_ENABLED=1' : '' -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", -] - Pod::Spec.new do |s| s.name = "React-RCTFBReactNativeSpec" s.version = version @@ -43,18 +34,16 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "FBReactNativeSpec/**/*.{c,h,m,mm,S,cpp}" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + new_arch_flags + s.compiler_flags = new_arch_flags s.header_dir = header_dir s.module_name = module_name s.pod_target_xcconfig = { - "HEADER_SEARCH_PATHS" => header_search_paths, - "OTHER_CFLAGS" => "$(inherited) " + folly_compiler_flags + new_arch_flags, + "OTHER_CFLAGS" => "$(inherited) " + new_arch_flags, "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } s.dependency "React-jsi" s.dependency "React-jsiexecutor" - s.dependency "RCT-Folly" s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "React-Core" @@ -63,6 +52,7 @@ Pod::Spec.new do |s| add_dependency(s, "ReactCommon", :subspec => "turbomodule/bridging", :additional_framework_paths => ["react/nativemodule/bridging"]) depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.script_phases = [ { diff --git a/packages/react-native/React/React-RCTFabric.podspec b/packages/react-native/React/React-RCTFabric.podspec index 7863a0decb8..5c79f198100 100644 --- a/packages/react-native/React/React-RCTFabric.podspec +++ b/packages/react-native/React/React-RCTFabric.podspec @@ -16,20 +16,10 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] new_arch_flags = ENV['RCT_NEW_ARCH_ENABLED'] == '1' ? ' -DRCT_NEW_ARCH_ENABLED=1' : '' header_search_paths = [ "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"", - "\"$(PODS_ROOT)/boost\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"", - "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_ROOT)/Headers/Private/React-Core\"", "\"$(PODS_ROOT)/Headers/Private/Yoga\"", "\"$(PODS_ROOT)/Headers/Public/ReactCodegen\"", @@ -55,14 +45,14 @@ Pod::Spec.new do |s| s.source_files = "Fabric/**/*.{c,h,m,mm,S,cpp}" s.exclude_files = "**/tests/*", "**/android/*", - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + new_arch_flags + s.compiler_flags = new_arch_flags s.header_dir = header_dir s.module_name = module_name s.weak_framework = "JavaScriptCore" s.framework = "MobileCoreServices" s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths, - "OTHER_CFLAGS" => "$(inherited) " + folly_compiler_flags + new_arch_flags, + "OTHER_CFLAGS" => "$(inherited) " + new_arch_flags, "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }.merge!(ENV['USE_FRAMEWORKS'] != nil ? { "PUBLIC_HEADERS_FOLDER_PATH" => "#{module_name}.framework/Headers/#{header_dir}" @@ -70,8 +60,6 @@ Pod::Spec.new do |s| s.dependency "React-Core" s.dependency "React-RCTImage" - s.dependency "RCT-Folly/Fabric", folly_version - s.dependency "glog" s.dependency "Yoga" s.dependency "React-RCTText" s.dependency "React-jsi" @@ -101,6 +89,7 @@ Pod::Spec.new do |s| add_dependency(s, "React-renderercss") depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.test_spec 'Tests' do |test_spec| test_spec.source_files = "Tests/**/*.{mm}" diff --git a/packages/react-native/React/Runtime/React-RCTRuntime.podspec b/packages/react-native/React/Runtime/React-RCTRuntime.podspec index 661813c60bb..a32868d8b67 100644 --- a/packages/react-native/React/Runtime/React-RCTRuntime.podspec +++ b/packages/react-native/React/Runtime/React-RCTRuntime.podspec @@ -16,21 +16,8 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] new_arch_flags = ENV['RCT_NEW_ARCH_ENABLED'] == '1' ? ' -DRCT_NEW_ARCH_ENABLED=1' : '' -header_search_paths = [ - "\"$(PODS_ROOT)/boost\"", - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"" -] - module_name = "RCTRuntime" header_dir = "React" @@ -44,7 +31,7 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "*.{h,mm}" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + new_arch_flags + s.compiler_flags = new_arch_flags s.header_dir = header_dir s.module_name = module_name @@ -53,8 +40,7 @@ Pod::Spec.new do |s| end s.pod_target_xcconfig = { - "HEADER_SEARCH_PATHS" => header_search_paths, - "OTHER_CFLAGS" => "$(inherited) " + folly_compiler_flags + new_arch_flags, + "OTHER_CFLAGS" => "$(inherited) " + new_arch_flags, "DEFINES_MODULE" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }.merge!(ENV['USE_FRAMEWORKS'] != nil ? { @@ -62,8 +48,6 @@ Pod::Spec.new do |s| }: {}) s.dependency "React-Core" - s.dependency "RCT-Folly/Fabric", folly_version - s.dependency "glog" s.dependency "React-jsi" add_dependency(s, "React-jsitooling", :framework_name => "JSITooling") add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern') @@ -82,4 +66,5 @@ Pod::Spec.new do |s| s.exclude_files = ["RCTHermesInstanceFactory.{mm,h}"] end depend_on_js_engine(s) + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index 3270ae96581..0015b7d5ec4 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -16,13 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -folly_dep_name = folly_config[:dep_name] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] react_native_path = ".." Pod::Spec.new do |s| @@ -44,18 +37,12 @@ Pod::Spec.new do |s| s.module_name = 'React_Fabric' end - s.dependency folly_dep_name, folly_version - s.dependency "React-jsiexecutor" s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "ReactCommon/turbomodule/core" s.dependency "React-jsi" s.dependency "React-logger" - s.dependency "glog" - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" s.dependency "React-Core" s.dependency "React-debug" s.dependency "React-featureflags" @@ -67,18 +54,15 @@ Pod::Spec.new do |s| add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"]) depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.subspec "animations" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/animations/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/animations/tests" ss.header_dir = "react/renderer/animations" end s.subspec "attributedstring" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/attributedstring/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/attributedstring/tests" ss.header_dir = "react/renderer/attributedstring" @@ -86,13 +70,9 @@ Pod::Spec.new do |s| s.subspec "core" do |ss| header_search_path = [ - "\"$(PODS_ROOT)/boost\"", "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"", - "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_ROOT)/Headers/Private/Yoga\"", - "\"$(PODS_TARGET_SRCROOT)\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fmt/include\"", + "\"$(PODS_TARGET_SRCROOT)\"" ] if ENV['USE_FRAMEWORKS'] @@ -103,8 +83,6 @@ Pod::Spec.new do |s| ] 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" @@ -114,33 +92,25 @@ Pod::Spec.new do |s| end s.subspec "componentregistry" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/componentregistry/*.{m,mm,cpp,h}" ss.header_dir = "react/renderer/componentregistry" end s.subspec "componentregistrynative" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/componentregistry/native/**/*.{m,mm,cpp,h}" ss.header_dir = "react/renderer/componentregistry/native" end s.subspec "components" do |ss| ss.subspec "root" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags 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" end ss.subspec "view" do |sss| - sss.dependency folly_dep_name, folly_version sss.dependency "React-renderercss" sss.dependency "Yoga" - sss.compiler_flags = folly_compiler_flags sss.source_files = "react/renderer/components/view/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/components/view/tests", "react/renderer/components/view/platform/android", "react/renderer/components/view/platform/windows" sss.header_dir = "react/renderer/components/view" @@ -148,16 +118,12 @@ Pod::Spec.new do |s| end ss.subspec "scrollview" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags sss.source_files = "react/renderer/components/scrollview/*.{m,mm,cpp,h}" sss.header_dir = "react/renderer/components/scrollview" ss.exclude_files = "react/renderer/components/scrollview/tests" end ss.subspec "legacyviewmanagerinterop" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags 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" @@ -166,17 +132,13 @@ Pod::Spec.new do |s| end s.subspec "dom" do |ss| - ss.dependency folly_dep_name, folly_version ss.dependency "React-graphics" - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/dom/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/dom/tests" ss.header_dir = "react/renderer/dom" end s.subspec "scheduler" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/scheduler/**/*.{m,mm,cpp,h}" ss.header_dir = "react/renderer/scheduler" @@ -185,15 +147,11 @@ Pod::Spec.new do |s| end s.subspec "imagemanager" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/imagemanager/*.{m,mm,cpp,h}" ss.header_dir = "react/renderer/imagemanager" end s.subspec "mounting" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/mounting/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/mounting/tests" ss.header_dir = "react/renderer/mounting" @@ -201,8 +159,6 @@ Pod::Spec.new do |s| s.subspec "observers" do |ss| ss.subspec "events" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags sss.source_files = "react/renderer/observers/events/**/*.{m,mm,cpp,h}" sss.exclude_files = "react/renderer/observers/events/tests" sss.header_dir = "react/renderer/observers/events" @@ -210,16 +166,12 @@ Pod::Spec.new do |s| end s.subspec "templateprocessor" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/templateprocessor/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/templateprocessor/tests" ss.header_dir = "react/renderer/templateprocessor" end s.subspec "telemetry" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/telemetry/**/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/telemetry/tests" ss.header_dir = "react/renderer/telemetry" @@ -227,30 +179,22 @@ Pod::Spec.new do |s| end s.subspec "consistency" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/consistency/**/*.{m,mm,cpp,h}" ss.header_dir = "react/renderer/consistency" end s.subspec "uimanager" do |ss| ss.subspec "consistency" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags sss.source_files = "react/renderer/uimanager/consistency/*.{m,mm,cpp,h}" sss.header_dir = "react/renderer/uimanager/consistency" end - ss.dependency folly_dep_name, folly_version ss.dependency "React-rendererconsistency" - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/uimanager/*.{m,mm,cpp,h}" ss.header_dir = "react/renderer/uimanager" end s.subspec "leakchecker" do |ss| - ss.dependency folly_dep_name, folly_version - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/leakchecker/**/*.{cpp,h}" ss.exclude_files = "react/renderer/leakchecker/tests" ss.header_dir = "react/renderer/leakchecker" diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec index a07cdd9f5f5..392693894d7 100644 --- a/packages/react-native/ReactCommon/React-FabricComponents.podspec +++ b/packages/react-native/ReactCommon/React-FabricComponents.podspec @@ -16,26 +16,14 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -folly_dep_name = folly_config[:dep_name] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] react_native_path = ".." Pod::Spec.new do |s| header_search_path = [ - "\"$(PODS_ROOT)/boost\"", "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"", - "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_ROOT)/Headers/Private/Yoga\"", "\"$(PODS_TARGET_SRCROOT)\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"", ] if ENV['USE_FRAMEWORKS'] @@ -66,18 +54,12 @@ Pod::Spec.new do |s| s.module_name = 'React_FabricComponents' end - s.dependency folly_dep_name, folly_version - s.dependency "React-jsiexecutor" s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "ReactCommon/turbomodule/core" s.dependency "React-jsi" s.dependency "React-logger" - s.dependency "glog" - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" s.dependency "React-Core" s.dependency "React-debug" s.dependency "React-featureflags" @@ -94,35 +76,28 @@ Pod::Spec.new do |s| ]) depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.subspec "components" do |ss| ss.subspec "inputaccessory" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags 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" end ss.subspec "modal" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags 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" end ss.subspec "rncore" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags sss.source_files = "react/renderer/components/rncore/**/*.{m,mm,cpp,h}" sss.header_dir = "react/renderer/components/rncore" end ss.subspec "safeareaview" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags 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" @@ -130,16 +105,12 @@ Pod::Spec.new do |s| end ss.subspec "scrollview" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags sss.source_files = "react/renderer/components/scrollview/*.{m,mm,cpp,h}" sss.header_dir = "react/renderer/components/scrollview" end ss.subspec "text" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags 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" @@ -147,8 +118,6 @@ Pod::Spec.new do |s| end ss.subspec "iostextinput" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags sss.source_files = "react/renderer/components/textinput/*.{m,mm,cpp,h}", "react/renderer/components/textinput/platform/ios/**/*.{m,mm,cpp,h}" sss.header_dir = "react/renderer/components/iostextinput" @@ -156,16 +125,12 @@ Pod::Spec.new do |s| end ss.subspec "textinput" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags sss.source_files = "react/renderer/components/textinput/*.{m,mm,cpp,h}" sss.header_dir = "react/renderer/components/textinput" end ss.subspec "unimplementedview" do |sss| - sss.dependency folly_dep_name, folly_version - sss.compiler_flags = folly_compiler_flags 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" @@ -174,9 +139,7 @@ Pod::Spec.new do |s| end s.subspec "textlayoutmanager" do |ss| - ss.dependency folly_dep_name, folly_version ss.dependency "React-Fabric" - ss.compiler_flags = folly_compiler_flags ss.source_files = "react/renderer/textlayoutmanager/platform/ios/**/*.{m,mm,cpp,h}", "react/renderer/textlayoutmanager/*.{m,mm,cpp,h}" ss.exclude_files = "react/renderer/textlayoutmanager/tests", diff --git a/packages/react-native/ReactCommon/React-FabricImage.podspec b/packages/react-native/ReactCommon/React-FabricImage.podspec index 8581340bd30..cb71d7a2eee 100644 --- a/packages/react-native/ReactCommon/React-FabricImage.podspec +++ b/packages/react-native/ReactCommon/React-FabricImage.podspec @@ -16,23 +16,11 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -folly_dep_name = folly_config[:dep_name] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] react_native_path = ".." header_search_path = [ - "\"$(PODS_ROOT)/boost\"", "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"", - "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_ROOT)/Headers/Private/Yoga\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"", ] if ENV['USE_FRAMEWORKS'] @@ -56,7 +44,6 @@ Pod::Spec.new do |s| s.source_files = "react/renderer/components/image/**/*.{m,mm,cpp,h}" s.exclude_files = "react/renderer/components/image/tests" s.header_dir = "react/renderer/components/image" - s.compiler_flags = folly_compiler_flags s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "HEADER_SEARCH_PATHS" => header_search_path.join(" ") @@ -67,17 +54,11 @@ Pod::Spec.new do |s| s.module_name = 'React_FabricImage' end - s.dependency folly_dep_name, folly_version - s.dependency "React-jsiexecutor", version s.dependency "RCTRequired", version s.dependency "RCTTypeSafety", version s.dependency "React-jsi" s.dependency "React-logger" - s.dependency "glog" - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" s.dependency "React-featureflags" s.dependency "React-utils" s.dependency "Yoga" @@ -95,4 +76,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-rendererdebug") depend_on_js_engine(s) + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/React-Mapbuffer.podspec b/packages/react-native/ReactCommon/React-Mapbuffer.podspec index 883729c2857..6f9f585ebf3 100644 --- a/packages/react-native/ReactCommon/React-Mapbuffer.podspec +++ b/packages/react-native/ReactCommon/React-Mapbuffer.podspec @@ -29,7 +29,7 @@ Pod::Spec.new do |s| s.exclude_files = "react/renderer/mapbuffer/tests" s.public_header_files = 'react/renderer/mapbuffer/*.h' s.header_dir = "react/renderer/mapbuffer" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"", "USE_HEADERMAP" => "YES", + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => ["\"$(PODS_TARGET_SRCROOT)\""], "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } if ENV['USE_FRAMEWORKS'] @@ -37,7 +37,7 @@ Pod::Spec.new do |s| s.module_name = 'React_Mapbuffer' end - s.dependency "glog" add_dependency(s, "React-debug") + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/ReactCommon.podspec b/packages/react-native/ReactCommon/ReactCommon.podspec index 12fac13f652..e67ea85ebbb 100644 --- a/packages/react-native/ReactCommon/ReactCommon.podspec +++ b/packages/react-native/ReactCommon/ReactCommon.podspec @@ -16,11 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1" Pod::Spec.new do |s| @@ -34,8 +29,7 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.header_dir = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_ROOT)/Headers/Private/React-Core\"", + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\"", "USE_HEADERMAP" => "YES", "DEFINES_MODULE" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), @@ -44,6 +38,8 @@ Pod::Spec.new do |s| s.header_mappings_dir = './' end + add_rn_third_party_dependencies(s) + # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..." # Note: Update this only when ready to minimize breaking changes. s.subspec "turbomodule" do |ss| @@ -51,12 +47,7 @@ Pod::Spec.new do |s| ss.dependency "React-perflogger", version ss.dependency "React-cxxreact", version ss.dependency "React-jsi", version - ss.dependency "RCT-Folly", folly_version ss.dependency "React-logger", version - ss.dependency "DoubleConversion" - ss.dependency "fast_float" - ss.dependency "fmt", "11.0.2" - ss.dependency "glog" if using_hermes ss.dependency "hermes-engine" end @@ -66,7 +57,7 @@ Pod::Spec.new do |s| sss.source_files = "react/bridging/**/*.{cpp,h}" sss.exclude_files = "react/bridging/tests" sss.header_dir = "react/bridging" - sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" } + sss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" } if using_hermes sss.dependency "hermes-engine" end diff --git a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec index cc26f4e05b9..6374e2f0a67 100644 --- a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec +++ b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec @@ -17,11 +17,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] Pod::Spec.new do |s| s.name = "React-cxxreact" @@ -34,19 +29,12 @@ Pod::Spec.new do |s| s.source = source s.source_files = "*.{cpp,h}" s.exclude_files = "SampleCxxModule.*" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers\"", + "HEADER_SEARCH_PATHS" => "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers\"", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } s.header_dir = "cxxreact" - s.dependency "boost" - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" - s.dependency "RCT-Folly", folly_version - s.dependency "glog" add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern') add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing') s.dependency "React-callinvoker", version @@ -62,4 +50,6 @@ Pod::Spec.new do |s| if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1" s.dependency 'hermes-engine' end + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/hermes/React-hermes.podspec b/packages/react-native/ReactCommon/hermes/React-hermes.podspec index 19e979cacfb..4fd736f9070 100644 --- a/packages/react-native/ReactCommon/hermes/React-hermes.podspec +++ b/packages/react-native/ReactCommon/hermes/React-hermes.podspec @@ -17,12 +17,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| s.name = "React-hermes" s.version = version @@ -35,9 +29,8 @@ Pod::Spec.new do |s| s.source_files = "executor/*.{cpp,h}", "inspector-modern/chrome/*.{cpp,h}", s.public_header_files = "executor/HermesExecutorFactory.h" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { - "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"", + "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\"", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } s.header_dir = "reacthermes" @@ -46,12 +39,9 @@ Pod::Spec.new do |s| add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern') add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing') s.dependency "React-perflogger", version - s.dependency "RCT-Folly", folly_version - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" - s.dependency "glog" s.dependency "hermes-engine" s.dependency "React-jsi" s.dependency "React-runtimeexecutor" + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec b/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec index d2568852351..f918c29e316 100644 --- a/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec +++ b/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec @@ -16,13 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -folly_dep_name = folly_config[:dep_name] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] react_native_path = ".." Pod::Spec.new do |s| @@ -40,17 +33,13 @@ Pod::Spec.new do |s| "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - if ENV['USE_FRAMEWORKS'] s.header_mappings_dir = '../' s.module_name = 'React_jserrorhandler' end - s.dependency folly_dep_name, folly_version s.dependency "React-jsi" s.dependency "React-cxxreact" - s.dependency "glog" s.dependency "ReactCommon/turbomodule/bridging" add_dependency(s, "React-featureflags") add_dependency(s, "React-debug") @@ -59,4 +48,6 @@ Pod::Spec.new do |s| s.dependency 'hermes-engine' end + add_rn_third_party_dependencies(s) + end diff --git a/packages/react-native/ReactCommon/jsi/React-jsi.podspec b/packages/react-native/ReactCommon/jsi/React-jsi.podspec index d1a814e8662..5b2cbf5829a 100644 --- a/packages/react-native/ReactCommon/jsi/React-jsi.podspec +++ b/packages/react-native/ReactCommon/jsi/React-jsi.podspec @@ -20,12 +20,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| s.name = "React-jsi" s.version = version @@ -37,20 +31,11 @@ Pod::Spec.new do |s| s.source = source s.header_dir = "jsi" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\"", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "DEFINES_MODULE" => "YES" } - s.dependency "boost" - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" - s.dependency "RCT-Folly", folly_version - s.dependency "glog" - s.source_files = "**/*.{cpp,h}" files_to_exclude = [ "jsi/jsilib-posix.cpp", @@ -63,4 +48,6 @@ Pod::Spec.new do |s| s.dependency "hermes-engine" end s.exclude_files = files_to_exclude + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec index 023d1bc1424..e72c700e82f 100644 --- a/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec +++ b/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec @@ -16,12 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| s.name = "React-jsiexecutor" s.version = version @@ -32,22 +26,17 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "jsireact/*.{cpp,h}" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\"", - "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } + s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } s.header_dir = "jsireact" s.dependency "React-cxxreact", version s.dependency "React-jsi", version s.dependency "React-perflogger", version - s.dependency "RCT-Folly", folly_version - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" - s.dependency "glog" add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern') add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing') if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1" s.dependency 'hermes-engine' end + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec b/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec index ce0ab91069c..443e1b5fe4b 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec +++ b/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec @@ -16,16 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] - -header_search_paths = [ - "\"$(PODS_ROOT)/boost\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"", - "\"$(PODS_ROOT)/RCT-Folly\"", -] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/..\"" @@ -45,7 +36,6 @@ Pod::Spec.new do |s| s.source = source s.source_files = "*.{cpp,h}" s.header_dir = header_dir - s.compiler_flags = folly_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), @@ -58,10 +48,7 @@ Pod::Spec.new do |s| s.module_name = module_name end - s.dependency "glog" - s.dependency "RCT-Folly" s.dependency "React-featureflags" - s.dependency "DoubleConversion" s.dependency "React-runtimeexecutor", version s.dependency "React-jsi" add_dependency(s, "React-jsinspectornetwork", :framework_name => 'jsinspector_modernnetwork') @@ -71,4 +58,5 @@ Pod::Spec.new do |s| s.dependency "hermes-engine" end + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/jsinspector-modern/network/React-jsinspectornetwork.podspec b/packages/react-native/ReactCommon/jsinspector-modern/network/React-jsinspectornetwork.podspec index 4461b029d34..e5ed66f9b76 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/network/React-jsinspectornetwork.podspec +++ b/packages/react-native/ReactCommon/jsinspector-modern/network/React-jsinspectornetwork.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] - -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", -] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../..\"" @@ -41,7 +36,6 @@ Pod::Spec.new do |s| s.source = source s.source_files = "*.{cpp,h}" s.header_dir = header_dir - s.compiler_flags = folly_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), @@ -52,6 +46,5 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../.." end - s.dependency "glog" - s.dependency "RCT-Folly" + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec b/packages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec index 1ecc9bfb079..9df0699bc78 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec +++ b/packages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] - -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", -] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../..\"" @@ -41,7 +36,6 @@ Pod::Spec.new do |s| s.source = source s.source_files = "*.{cpp,h}" s.header_dir = header_dir - s.compiler_flags = folly_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), @@ -52,6 +46,7 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../.." end - s.dependency "RCT-Folly" s.dependency "React-oscompat" + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/jsitooling/React-jsitooling.podspec b/packages/react-native/ReactCommon/jsitooling/React-jsitooling.podspec index c61d2d7bf64..d9dff15a2cf 100644 --- a/packages/react-native/ReactCommon/jsitooling/React-jsitooling.podspec +++ b/packages/react-native/ReactCommon/jsitooling/React-jsitooling.podspec @@ -16,20 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - -header_search_paths = [ - "\"$(PODS_ROOT)/boost\"", - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"" -] - Pod::Spec.new do |s| s.name = "React-jsitooling" s.version = version @@ -40,7 +26,6 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "react/runtime/*.{cpp,h}" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.header_dir = "react/runtime" if ENV['USE_FRAMEWORKS'] @@ -48,16 +33,12 @@ Pod::Spec.new do |s| s.header_mappings_dir = "./" end - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths.join(" "), - "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } + s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } s.dependency "React-cxxreact", version s.dependency "React-jsi", version - s.dependency "RCT-Folly", folly_version - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" - s.dependency "glog" add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern') add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing') + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/logger/React-logger.podspec b/packages/react-native/ReactCommon/logger/React-logger.podspec index e410936815c..4e4e1693867 100644 --- a/packages/react-native/ReactCommon/logger/React-logger.podspec +++ b/packages/react-native/ReactCommon/logger/React-logger.podspec @@ -17,12 +17,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| s.name = "React-logger" s.version = version @@ -33,9 +27,7 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "*.{cpp,h}" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "" } s.header_dir = "logger" - s.dependency "glog" + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/featureflags/React-featureflags.podspec b/packages/react-native/ReactCommon/react/featureflags/React-featureflags.podspec index c0ba2a35dc2..dc6657d2cc4 100644 --- a/packages/react-native/ReactCommon/react/featureflags/React-featureflags.podspec +++ b/packages/react-native/ReactCommon/react/featureflags/React-featureflags.podspec @@ -22,10 +22,6 @@ if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../..\"" # this is needed to allow the feature flags access its own files end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - Pod::Spec.new do |s| s.name = "React-featureflags" s.version = version @@ -36,16 +32,15 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "*.{cpp,h}" - s.compiler_flags = folly_compiler_flags s.header_dir = "react/featureflags" s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), "DEFINES_MODULE" => "YES" } - s.dependency "RCT-Folly", folly_version - if ENV['USE_FRAMEWORKS'] s.module_name = "React_featureflags" s.header_mappings_dir = "../.." end + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec index 4eefbb058b5..3e281da7ccc 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec @@ -16,12 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| s.name = "React-NativeModulesApple" s.module_name = "React_NativeModulesApple" @@ -33,8 +27,7 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions s.source = source - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_featureflags.framework/Headers\"", + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_featureflags.framework/Headers\"", "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "GCC_WARN_PEDANTIC" => "YES" } @@ -44,7 +37,6 @@ Pod::Spec.new do |s| s.source_files = "ReactCommon/**/*.{mm,cpp,h}" - s.dependency "glog" s.dependency "ReactCommon/turbomodule/core" s.dependency "ReactCommon/turbomodule/bridging" s.dependency "React-callinvoker" @@ -57,4 +49,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern') depend_on_js_engine(s) + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec index 8f2bef6ab02..5eba6728c6f 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec @@ -16,13 +16,7 @@ else source[:tag] = "v#{version}" end -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", -] - -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the defaultsnativemodule to access its own files @@ -37,12 +31,11 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions s.source = source - s.compiler_flags = folly_compiler_flags s.source_files = "*.{cpp,h}" s.header_dir = "react/nativemodule/defaults" s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), - "OTHER_CFLAGS" => "$(inherited) " + folly_compiler_flags, + "OTHER_CFLAGS" => "$(inherited)", "DEFINES_MODULE" => "YES" } if ENV['USE_FRAMEWORKS'] @@ -50,10 +43,10 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../.." end - s.dependency "RCT-Folly" s.dependency "React-jsi" s.dependency "React-jsiexecutor" depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.dependency "React-domnativemodule" s.dependency "React-featureflagsnativemodule" diff --git a/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec index 11f24b8c98a..01492676e1e 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec @@ -17,14 +17,9 @@ else end header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_ROOT)/Headers/Private/Yoga\"", ] -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the domnativemodule to access its own files end @@ -38,12 +33,11 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions s.source = source - s.compiler_flags = folly_compiler_flags s.source_files = "*.{cpp,h}" s.header_dir = "react/nativemodule/dom" s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), - "OTHER_CFLAGS" => "$(inherited) " + folly_compiler_flags, + "OTHER_CFLAGS" => "$(inherited)", "DEFINES_MODULE" => "YES" } if ENV['USE_FRAMEWORKS'] @@ -51,11 +45,11 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../.." end - s.dependency "RCT-Folly" s.dependency "React-jsi" s.dependency "React-jsiexecutor" depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.dependency "Yoga" s.dependency "ReactCommon/turbomodule/core" diff --git a/packages/react-native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec index cb247409dbb..0b944edbb38 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec @@ -16,13 +16,7 @@ else source[:tag] = "v#{version}" end -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", -] - -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the feature flags access its own files @@ -37,12 +31,11 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions s.source = source - s.compiler_flags = folly_compiler_flags s.source_files = "*.{cpp,h}" s.header_dir = "react/nativemodule/featureflags" s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), - "OTHER_CFLAGS" => "$(inherited) " + folly_compiler_flags, + "OTHER_CFLAGS" => "$(inherited)", "DEFINES_MODULE" => "YES" } if ENV['USE_FRAMEWORKS'] @@ -50,11 +43,11 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../.." end - s.dependency "RCT-Folly" s.dependency "React-jsi" s.dependency "React-jsiexecutor" depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.dependency "ReactCommon/turbomodule/core" s.dependency "React-RCTFBReactNativeSpec" diff --git a/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec index bef0002d1a4..7038acefb5a 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec @@ -16,13 +16,7 @@ else source[:tag] = "v#{version}" end -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", -] - -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the module access its own files @@ -37,12 +31,11 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions s.source = source - s.compiler_flags = folly_compiler_flags s.source_files = "*.{cpp,h}" s.header_dir = "react/nativemodule/idlecallbacks" s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), - "OTHER_CFLAGS" => "$(inherited) " + folly_compiler_flags, + "OTHER_CFLAGS" => "$(inherited)", "DEFINES_MODULE" => "YES" } if ENV['USE_FRAMEWORKS'] @@ -50,14 +43,14 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../.." end - s.dependency "RCT-Folly" s.dependency "React-jsi" s.dependency "React-jsiexecutor" depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.dependency "ReactCommon/turbomodule/core" s.dependency "React-runtimescheduler" add_dependency(s, "React-RCTFBReactNativeSpec") - s.dependency "glog" + end diff --git a/packages/react-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec index 3546427832e..fa41705ea37 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec @@ -16,13 +16,7 @@ else source[:tag] = "v#{version}" end -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", -] - -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the microtasks module access its own files @@ -37,11 +31,10 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions s.source = source - s.compiler_flags = folly_compiler_flags s.source_files = "*.{cpp,h}" s.header_dir = "react/nativemodule/microtasks" s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), - "OTHER_CFLAGS" => "$(inherited) " + folly_compiler_flags, + "OTHER_CFLAGS" => "$(inherited)", "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), "DEFINES_MODULE" => "YES" } @@ -50,11 +43,11 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../.." end - s.dependency "RCT-Folly" s.dependency "React-jsi" s.dependency "React-jsiexecutor" depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.dependency "ReactCommon/turbomodule/core" add_dependency(s, "React-RCTFBReactNativeSpec") diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec index de235ce27c3..305ab3ac1be 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec @@ -16,19 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - header_search_paths = [ - "\"$(PODS_ROOT)/boost\"", - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"", "\"$(PODS_ROOT)/Headers/Private/React-Core\"", ] @@ -45,7 +33,6 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions s.source = source - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths, "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), @@ -61,10 +48,6 @@ Pod::Spec.new do |s| s.source_files = "ReactCommon/**/*.{cpp,h}", "platform/ios/**/*.{mm,cpp,h}" - s.dependency "RCT-Folly" - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" s.dependency "React-Core" s.dependency "React-cxxreact" s.dependency "React-jsi" @@ -73,4 +56,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-NativeModulesApple") depend_on_js_engine(s) + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/performance/timeline/React-performancetimeline.podspec b/packages/react-native/ReactCommon/react/performance/timeline/React-performancetimeline.podspec index 553c9e81cd7..146db5f7278 100644 --- a/packages/react-native/ReactCommon/react/performance/timeline/React-performancetimeline.podspec +++ b/packages/react-native/ReactCommon/react/performance/timeline/React-performancetimeline.podspec @@ -16,14 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/boost\"", -] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the performancetimeline access its own files @@ -39,7 +32,6 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "**/*.{cpp,h}" - s.compiler_flags = folly_compiler_flags s.header_dir = "react/performance/timeline" s.exclude_files = "tests" s.pod_target_xcconfig = { @@ -56,5 +48,6 @@ Pod::Spec.new do |s| s.dependency "React-timing" s.dependency "React-cxxreact" s.dependency "React-perflogger" - s.dependency "RCT-Folly", folly_version + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec b/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec index 01fd6be3640..63fcb3adef2 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec +++ b/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec @@ -16,17 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"" -] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the Renderer/Debug access its own files @@ -42,7 +32,6 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "**/*.{cpp,h,mm}" - s.compiler_flags = folly_compiler_flags s.header_dir = "react/renderer/debug" s.exclude_files = "tests" s.pod_target_xcconfig = { @@ -56,9 +45,6 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../../.." end - s.dependency "RCT-Folly", folly_version - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" add_dependency(s, "React-debug") + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec index b9b17a693b0..e8da7b2f76a 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec +++ b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec @@ -16,22 +16,10 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| source_files = "*.{m,mm,cpp,h}", "platform/ios/**/*.{m,mm,cpp,h}" header_search_paths = [ - "\"$(PODS_ROOT)/boost\"", "\"$(PODS_TARGET_SRCROOT)/../../../\"", - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"" ] s.name = "React-graphics" @@ -42,7 +30,6 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions s.source = source - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.source_files = source_files s.header_dir = "react/renderer/graphics" s.framework = "UIKit" @@ -58,14 +45,10 @@ Pod::Spec.new do |s| "DEFINES_MODULE" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } - s.dependency "glog" - s.dependency "RCT-Folly/Fabric", folly_version s.dependency "React-jsi" s.dependency "React-jsiexecutor" s.dependency "React-utils" - s.dependency "DoubleConversion" - s.dependency "fast_float" - s.dependency "fmt", "11.0.2" - + depend_on_js_engine(s) + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec index d4d14d52251..ae86b9d0f36 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec @@ -16,21 +16,11 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| source_files = "**/*.{m,mm,cpp,h}" header_search_paths = [ - "\"$(PODS_ROOT)/boost\"", "\"$(PODS_TARGET_SRCROOT)/../../../\"", "\"$(PODS_TARGET_SRCROOT)\"", - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"", ].join(" ") s.name = "React-ImageManager" @@ -41,7 +31,6 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions s.source = source - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.source_files = source_files s.header_dir = "react/renderer/imagemanager" @@ -57,9 +46,7 @@ Pod::Spec.new do |s| "DEFINES_MODULE" => "YES", } - s.dependency "RCT-Folly/Fabric" s.dependency "React-Core/Default" - s.dependency "glog" add_dependency(s, "React-Fabric") add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"]) @@ -67,4 +54,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-utils") add_dependency(s, "React-rendererdebug") + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec index 6ab839408d2..0ec33c27479 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec @@ -16,14 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/boost\"", -] +header_search_paths = [] if ENV['USE_FRAMEWORKS'] header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the RuntimeScheduler access its own files @@ -39,7 +32,6 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "**/*.{cpp,h}" - s.compiler_flags = folly_compiler_flags s.header_dir = "react/renderer/runtimescheduler" s.exclude_files = "tests" s.pod_target_xcconfig = { @@ -58,8 +50,6 @@ Pod::Spec.new do |s| s.dependency "React-utils" s.dependency "React-featureflags" s.dependency "React-timing" - s.dependency "glog" - s.dependency "RCT-Folly", folly_version s.dependency "React-jsi" s.dependency "React-performancetimeline" s.dependency "React-rendererconsistency" @@ -67,4 +57,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing') depend_on_js_engine(s) + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec b/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec index 0c2e98e28d7..ed2e7a1d1bb 100644 --- a/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec +++ b/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec @@ -16,14 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -folly_dep_name = folly_config[:dep_name] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| s.name = "React-RuntimeCore" s.version = version @@ -36,32 +28,31 @@ Pod::Spec.new do |s| s.source_files = "*.{cpp,h}", "nativeviewconfig/*.{cpp,h}" s.exclude_files = "iostests/*", "tests/**/*.{cpp,h}" s.header_dir = "react/runtime" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"${PODS_TARGET_SRCROOT}/../..\"", + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\" \"${PODS_TARGET_SRCROOT}/../..\"", "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "GCC_WARN_PEDANTIC" => "YES" } - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags if ENV['USE_FRAMEWORKS'] s.header_mappings_dir = '../../' s.module_name = 'React_RuntimeCore' end - s.dependency folly_dep_name, folly_version s.dependency "React-jsiexecutor" s.dependency "React-cxxreact" s.dependency "React-runtimeexecutor" - s.dependency "glog" s.dependency "React-jsi" s.dependency "React-jserrorhandler" s.dependency "React-performancetimeline" s.dependency "React-runtimescheduler" s.dependency "React-utils" s.dependency "React-featureflags" - + add_dependency(s, "React-Fabric") depend_on_js_engine(s) + add_rn_third_party_dependencies(s) + s.dependency "React-jsinspector" add_dependency(s, "React-jsitooling", :framework_name => "JSITooling") end diff --git a/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec b/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec index 859aaac9f33..4aefe7b762b 100644 --- a/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec +++ b/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec @@ -16,14 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -folly_dep_name = folly_config[:dep_name] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| s.name = "React-RuntimeHermes" s.version = version @@ -35,18 +27,16 @@ Pod::Spec.new do |s| s.source = source s.source_files = "hermes/*.{cpp,h}" s.header_dir = "react/runtime/hermes" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"${PODS_TARGET_SRCROOT}/../..\" \"${PODS_TARGET_SRCROOT}/../../hermes/executor\" \"$(PODS_ROOT)/boost\"", + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"${PODS_TARGET_SRCROOT}/../..\" \"${PODS_TARGET_SRCROOT}/../../hermes/executor\"", "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "GCC_WARN_PEDANTIC" => "YES" } - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags if ENV['USE_FRAMEWORKS'] s.header_mappings_dir = '../../' s.module_name = 'React_RuntimeHermes' end - s.dependency folly_dep_name, folly_version s.dependency "React-jsitracing" s.dependency "React-jsi" s.dependency "React-utils" @@ -58,4 +48,6 @@ Pod::Spec.new do |s| s.dependency "React-hermes" s.dependency "hermes-engine" add_dependency(s, "React-jsitooling", :framework_name => "JSITooling") + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec b/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec index 9bf22c28a88..1e9917b8737 100644 --- a/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec +++ b/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec @@ -16,16 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -folly_dep_name = folly_config[:dep_name] - -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - header_search_paths = [ - "$(PODS_ROOT)/boost", "$(PODS_ROOT)/Headers/Private/React-Core", "$(PODS_TARGET_SRCROOT)/../../../..", "$(PODS_TARGET_SRCROOT)/../../../../..", @@ -46,14 +37,12 @@ Pod::Spec.new do |s| "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "GCC_WARN_PEDANTIC" => "YES" } - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags if ENV['USE_FRAMEWORKS'] s.header_mappings_dir = './' s.module_name = 'React_RuntimeApple' end - s.dependency folly_dep_name, folly_version s.dependency "React-jsiexecutor" s.dependency "React-cxxreact" s.dependency "React-callinvoker" @@ -83,4 +72,6 @@ Pod::Spec.new do |s| s.dependency "React-jsc" s.exclude_files = "ReactCommon/RCTHermesInstance.{mm,h}" end + + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/react/utils/React-utils.podspec b/packages/react-native/ReactCommon/react/utils/React-utils.podspec index 576bb7abd18..f799291920e 100644 --- a/packages/react-native/ReactCommon/react/utils/React-utils.podspec +++ b/packages/react-native/ReactCommon/react/utils/React-utils.podspec @@ -16,12 +16,7 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_TARGET_SRCROOT)\"", "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"", ] @@ -36,7 +31,6 @@ Pod::Spec.new do |s| s.platforms = min_supported_versions s.source = source s.source_files = "**/*.{cpp,h,mm}" - s.compiler_flags = folly_compiler_flags s.header_dir = "react/utils" s.exclude_files = "tests" s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), @@ -48,11 +42,10 @@ Pod::Spec.new do |s| s.header_mappings_dir = "../.." end - s.dependency "RCT-Folly", folly_version s.dependency "React-jsi", version - s.dependency "glog" depend_on_js_engine(s) + add_rn_third_party_dependencies(s) add_dependency(s, "React-debug") end diff --git a/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec b/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec index 686454f975c..b8acc3926e0 100644 --- a/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec +++ b/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec @@ -16,16 +16,8 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - header_search_paths = [ - "\"$(PODS_TARGET_SRCROOT)/..\"", - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"" + "\"$(PODS_TARGET_SRCROOT)/..\"" ] Pod::Spec.new do |s| @@ -40,12 +32,10 @@ Pod::Spec.new do |s| s.source_files = "reactperflogger/*.{cpp,h}", "fusebox/*.{cpp,h}" s.header_dir = "reactperflogger" s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } - s.compiler_flags = folly_compiler_flags s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), } - s.dependency "RCT-Folly", folly_version - s.dependency "DoubleConversion" + add_rn_third_party_dependencies(s) end diff --git a/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec b/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec index 14a3824cd62..c6fb40df8de 100644 --- a/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec +++ b/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec @@ -16,12 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] -boost_config = get_boost_config() -boost_compiler_flags = boost_config[:compiler_flags] - Pod::Spec.new do |s| s.name = "React-runtimeexecutor" s.version = version diff --git a/packages/react-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap b/packages/react-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap index d896b8b8a32..20ab12f8848 100644 --- a/packages/react-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap +++ b/packages/react-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap @@ -358,11 +358,7 @@ folly_compiler_flags = Helpers::Constants.folly_config[:compiler_flags] boost_compiler_flags = Helpers::Constants.boost_config[:compiler_flags] header_search_paths = [ - \\"\\\\\\"$(PODS_ROOT)/boost\\\\\\"\\", - \\"\\\\\\"$(PODS_ROOT)/RCT-Folly\\\\\\"\\", - \\"\\\\\\"$(PODS_ROOT)/DoubleConversion\\\\\\"\\", - \\"\\\\\\"$(PODS_ROOT)/fast_float/include\\\\\\"\\", - \\"\\\\\\"$(PODS_ROOT)/fmt/include\\\\\\"\\", + \\"\\\\\\"$(PODS_ROOT)/ReactNativeDependencies\\\\\\"\\", \\"\\\\\\"\${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\\\\\\"\\", \\"\\\\\\"$(PODS_ROOT)/Headers/Private/React-Fabric\\\\\\"\\", \\"\\\\\\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\\\\\\"\\", @@ -407,7 +403,6 @@ Pod::Spec.new do |s| } s.dependency \\"React-jsiexecutor\\" - s.dependency \\"RCT-Folly\\" s.dependency \\"RCTRequired\\" s.dependency \\"RCTTypeSafety\\" s.dependency \\"React-Core\\" @@ -415,8 +410,6 @@ Pod::Spec.new do |s| s.dependency \\"ReactCommon/turbomodule/bridging\\" s.dependency \\"ReactCommon/turbomodule/core\\" s.dependency \\"React-NativeModulesApple\\" - s.dependency \\"glog\\" - s.dependency \\"DoubleConversion\\" s.dependency 'React-graphics' s.dependency 'React-rendererdebug' s.dependency 'React-Fabric' @@ -427,6 +420,7 @@ Pod::Spec.new do |s| s.dependency 'React-RCTAppDelegate' depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.script_phases = { 'name' => 'Generate Specs', diff --git a/packages/react-native/scripts/codegen/templates/ReactCodegen.podspec.template b/packages/react-native/scripts/codegen/templates/ReactCodegen.podspec.template index 95044810022..e92927a20ee 100644 --- a/packages/react-native/scripts/codegen/templates/ReactCodegen.podspec.template +++ b/packages/react-native/scripts/codegen/templates/ReactCodegen.podspec.template @@ -17,11 +17,7 @@ folly_compiler_flags = Helpers::Constants.folly_config[:compiler_flags] boost_compiler_flags = Helpers::Constants.boost_config[:compiler_flags] header_search_paths = [ - "\"$(PODS_ROOT)/boost\"", - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_ROOT)/DoubleConversion\"", - "\"$(PODS_ROOT)/fast_float/include\"", - "\"$(PODS_ROOT)/fmt/include\"", + "\"$(PODS_ROOT)/ReactNativeDependencies\"", "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"", "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"", @@ -66,7 +62,6 @@ Pod::Spec.new do |s| } s.dependency "React-jsiexecutor" - s.dependency "RCT-Folly" s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "React-Core" @@ -74,8 +69,6 @@ Pod::Spec.new do |s| s.dependency "ReactCommon/turbomodule/bridging" s.dependency "ReactCommon/turbomodule/core" s.dependency "React-NativeModulesApple" - s.dependency "glog" - s.dependency "DoubleConversion" s.dependency 'React-graphics' s.dependency 'React-rendererdebug' s.dependency 'React-Fabric' @@ -86,6 +79,7 @@ Pod::Spec.new do |s| s.dependency 'React-RCTAppDelegate' depend_on_js_engine(s) + add_rn_third_party_dependencies(s) s.script_phases = { 'name' => 'Generate Specs', diff --git a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec index bdd377b8ea8..82402883168 100644 --- a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec +++ b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec @@ -7,8 +7,6 @@ require "json" package = JSON.parse(File.read(File.join(__dir__, "../" "package.json"))) -boost_compiler_flags = '-Wno-documentation' - Pod::Spec.new do |s| s.name = "MyNativeView" s.version = package["version"] @@ -17,11 +15,11 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/sota000/my-native-view.git" s.license = "MIT" s.platforms = min_supported_versions - s.compiler_flags = boost_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.author = "Meta Platforms, Inc. and its affiliates" s.source = { :git => "https://github.com/facebook/my-native-view.git", :tag => "#{s.version}" } s.pod_target_xcconfig = { - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCodegen/ReactCodegen.framework/Headers\"", + "HEADER_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCodegen/ReactCodegen.framework/Headers\"", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } diff --git a/packages/rn-tester/RCTTest/React-RCTTest.podspec b/packages/rn-tester/RCTTest/React-RCTTest.podspec index f37f3359121..37fc4106f2d 100644 --- a/packages/rn-tester/RCTTest/React-RCTTest.podspec +++ b/packages/rn-tester/RCTTest/React-RCTTest.podspec @@ -16,10 +16,6 @@ else source[:tag] = "v#{version}" end -folly_config = get_folly_config() -folly_compiler_flags = folly_config[:compiler_flags] -folly_version = folly_config[:version] - Pod::Spec.new do |s| s.name = "React-RCTTest" s.version = version @@ -28,7 +24,7 @@ Pod::Spec.new do |s| s.license = package["license"] s.author = "Meta Platforms, Inc. and its affiliates" s.platforms = min_supported_versions - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' + s.compiler_flags = '-Wno-nullability-completeness' s.source = source s.source_files = "**/*.{h,m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" @@ -37,12 +33,12 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\"" } - s.dependency "RCT-Folly", folly_version s.dependency "React-Core", version s.dependency "React-CoreModules", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version + + add_rn_third_party_dependencies(s) end