diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index 9e4c28c6a73..bb7c16f10be 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -90,8 +90,8 @@ Pod::Spec.new do |s| s.subspec "bridgingUmbrella" do |ss| ss.source_files = "react/renderer/bridging/React/*.h" - ss.header_dir = "React" - ss.header_mappings_dir = "react/renderer/bridging/React" + ss.header_dir = "" + ss.header_mappings_dir = "react/renderer/bridging" end s.subspec "core" do |ss| @@ -140,8 +140,8 @@ Pod::Spec.new do |s| ss.subspec "rootUmbrella" do |sss| sss.source_files = "react/renderer/components/root/React/*.h" - sss.header_dir = "React" - sss.header_mappings_dir = "react/renderer/components/root/React" + sss.header_dir = "" + sss.header_mappings_dir = "react/renderer/components/root" end ss.subspec "view" do |sss| @@ -153,8 +153,8 @@ Pod::Spec.new do |s| ss.subspec "viewUmbrella" do |sss| sss.source_files = "react/renderer/components/view/React/*.h" - sss.header_dir = "React" - sss.header_mappings_dir = "react/renderer/components/view/React" + sss.header_dir = "" + sss.header_mappings_dir = "react/renderer/components/view" end ss.subspec "scrollview" do |sss| @@ -165,8 +165,8 @@ Pod::Spec.new do |s| ss.subspec "scrollviewUmbrella" do |sss| sss.source_files = "react/renderer/components/scrollview/React/*.h" - sss.header_dir = "React" - sss.header_mappings_dir = "react/renderer/components/scrollview/React" + sss.header_dir = "" + sss.header_mappings_dir = "react/renderer/components/scrollview" end ss.subspec "legacyviewmanagerinterop" do |sss| diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec index d2298b2b088..6cbe4239027 100644 --- a/packages/react-native/ReactCommon/React-FabricComponents.podspec +++ b/packages/react-native/ReactCommon/React-FabricComponents.podspec @@ -97,8 +97,8 @@ Pod::Spec.new do |s| ss.subspec "modalUmbrella" do |sss| sss.source_files = "react/renderer/components/modal/React/*.h" - sss.header_dir = "React" - sss.header_mappings_dir = "react/renderer/components/modal/React" + sss.header_dir = "" + sss.header_mappings_dir = "react/renderer/components/modal" end ss.subspec "safeareaview" do |sss| @@ -118,8 +118,8 @@ Pod::Spec.new do |s| ss.subspec "textUmbrella" do |sss| sss.source_files = "react/renderer/components/text/React/*.h" - sss.header_dir = "React" - sss.header_mappings_dir = "react/renderer/components/text/React" + sss.header_dir = "" + sss.header_mappings_dir = "react/renderer/components/text" end ss.subspec "iostextinput" do |sss| diff --git a/packages/react-native/ReactCommon/React-FabricImage.podspec b/packages/react-native/ReactCommon/React-FabricImage.podspec index db43a6c2866..a82ef901c4c 100644 --- a/packages/react-native/ReactCommon/React-FabricImage.podspec +++ b/packages/react-native/ReactCommon/React-FabricImage.podspec @@ -50,10 +50,10 @@ Pod::Spec.new do |s| "HEADER_SEARCH_PATHS" => header_search_path.join(" ") } - s.subspec "ImageUmbrella" do |ss| + s.subspec "imageUmbrella" do |ss| ss.source_files = "react/renderer/components/image/React/*.h" - ss.header_dir = "React" - ss.header_mappings_dir = "react/renderer/components/image/React" + ss.header_dir = "" + ss.header_mappings_dir = "react/renderer/components/image" end resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_FabricImage") diff --git a/packages/react-native/ReactCommon/React-Mapbuffer.podspec b/packages/react-native/ReactCommon/React-Mapbuffer.podspec index 133f9e5010f..3268a1543b2 100644 --- a/packages/react-native/ReactCommon/React-Mapbuffer.podspec +++ b/packages/react-native/ReactCommon/React-Mapbuffer.podspec @@ -32,10 +32,10 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => ["\"$(PODS_TARGET_SRCROOT)\""], "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } - s.subspec "MapBufferUmbrella" do |ss| + s.subspec "mapbufferUmbrella" do |ss| ss.source_files = "react/renderer/mapbuffer/React/*.h" - ss.header_dir = "React" - ss.header_mappings_dir = "react/renderer/mapbuffer/React" + ss.header_dir = "" + ss.header_mappings_dir = "react/renderer/mapbuffer" end resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_Mapbuffer") diff --git a/packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec b/packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec index aac5db20478..931b15bb188 100644 --- a/packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec +++ b/packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec @@ -36,10 +36,10 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') } s.header_dir = "ReactCommon" - s.subspec "CallInvokerUmbrella" do |ss| + s.subspec "callinvokerUmbrella" do |ss| ss.source_files = "React/*.h" - ss.header_dir = "React" - ss.header_mappings_dir = "React" + ss.header_dir = "" + ss.header_mappings_dir = "." end s.dependency "React-cxxstableapi" diff --git a/packages/react-native/ReactCommon/react/debug/React-debug.podspec b/packages/react-native/ReactCommon/react/debug/React-debug.podspec index 591f5798504..1386f6181cb 100644 --- a/packages/react-native/ReactCommon/react/debug/React-debug.podspec +++ b/packages/react-native/ReactCommon/react/debug/React-debug.podspec @@ -39,10 +39,10 @@ Pod::Spec.new do |s| resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_debug") - s.subspec "DebugUmbrella" do |ss| + s.subspec "debugUmbrella" do |ss| ss.source_files = "React/*.h" - ss.header_dir = "React" - ss.header_mappings_dir = "React" + ss.header_dir = "" + ss.header_mappings_dir = "." end s.subspec "redbox" do |ss| diff --git a/packages/react-native/ReactCommon/react/timing/React-timing.podspec b/packages/react-native/ReactCommon/react/timing/React-timing.podspec index a61ad9fe223..b0110594ec4 100644 --- a/packages/react-native/ReactCommon/react/timing/React-timing.podspec +++ b/packages/react-native/ReactCommon/react/timing/React-timing.podspec @@ -44,8 +44,8 @@ Pod::Spec.new do |s| s.subspec "timingUmbrella" do |ss| ss.source_files = "React/*.h" - ss.header_dir = "React" - ss.header_mappings_dir = "React" + ss.header_dir = "" + ss.header_mappings_dir = "." end s.resource_bundles = {'React-timing_privacy' => 'PrivacyInfo.xcprivacy'} diff --git a/packages/react-native/scripts/cocoapods/new_architecture.rb b/packages/react-native/scripts/cocoapods/new_architecture.rb index 0052196a206..98f9c743cf9 100644 --- a/packages/react-native/scripts/cocoapods/new_architecture.rb +++ b/packages/react-native/scripts/cocoapods/new_architecture.rb @@ -86,6 +86,9 @@ class NewArchitectureHelper ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-graphics", "React_graphics", ["react/renderer/graphics/platform/ios"]) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", ["react/renderer/components/view/platform/cxx"])) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-FabricImage", "React_FabricImage", [])) + .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-FabricComponents", "React_FabricComponents", [])) + .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Mapbuffer", "React_Mapbuffer", [])) + .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-RCTFBReactNativeSpec", "React_RCTFBReactNativeSpec", [])) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon", "ReactCommon", ["react/nativemodule/core"])) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-runtimeexecutor", "React_runtimeexecutor", ["platform/ios"])) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-NativeModulesApple", "React_NativeModulesApple", [])) diff --git a/packages/react-native/scripts/cocoapods/utils.rb b/packages/react-native/scripts/cocoapods/utils.rb index f65d0798fcb..a31cab7442f 100644 --- a/packages/react-native/scripts/cocoapods/utils.rb +++ b/packages/react-native/scripts/cocoapods/utils.rb @@ -386,7 +386,17 @@ class ReactNativePodsUtils ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon", "ReactCommon", ["react/nativemodule/core"]) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-runtimeexecutor", "React_runtimeexecutor", ["platform/ios"])) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon-Samples", "ReactCommon_Samples", ["platform/ios"])) - .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", ["react/renderer/components/view/platform/cxx"], false)) + .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", [ + "react/renderer/components/view/platform/cxx", + "react/renderer/components/scrollview/platform/cxx", + "react/renderer/components/scrollview/platform/ios", + ], false)) + .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-FabricComponents", "React_FabricComponents", [ + "react/renderer/textlayoutmanager/platform/ios", + "react/renderer/components/text/platform/cxx", + "react/renderer/components/textinput/platform/ios", + "react/renderer/components/switch/iosswitch", + ], false)) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-NativeModulesApple", "React_NativeModulesApple", [])) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-bridging", "React_bridging", [])) .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-graphics", "React_graphics", ["react/renderer/graphics/platform/ios"])) diff --git a/packages/react-native/scripts/ios-prebuild/headers-config.js b/packages/react-native/scripts/ios-prebuild/headers-config.js index cb52d5d8983..78e72e95d61 100644 --- a/packages/react-native/scripts/ios-prebuild/headers-config.js +++ b/packages/react-native/scripts/ios-prebuild/headers-config.js @@ -485,7 +485,7 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = { headerDir: 'react/renderer/mapbuffer', subSpecs: [ { - name: 'MapBufferUmbrella', + name: 'mapbufferUmbrella', headerPatterns: ['react/renderer/mapbuffer/React/*.h'], headerDir: 'React', }, @@ -501,7 +501,7 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = { headerDir: 'react/renderer/components/image', subSpecs: [ { - name: 'ImageUmbrella', + name: 'imageUmbrella', headerPatterns: ['react/renderer/components/image/React/*.h'], headerDir: 'React', }, @@ -514,7 +514,7 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = { headerDir: 'ReactCommon', subSpecs: [ { - name: 'CallInvokerUmbrella', + name: 'callinvokerUmbrella', headerPatterns: ['React/*.h'], headerDir: 'React', }, @@ -526,7 +526,7 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = { headerDir: 'react/debug', subSpecs: [ { - name: 'DebugUmbrella', + name: 'debugUmbrella', headerPatterns: ['React/*.h'], headerDir: 'React', },