Update umbrella subspecs configuration (#58260)

Summary:
Pull Request resolved: https://github.com/react/react-native/pull/58260

Changelog: [Internal]

Changes the configuration of the umbrella podspecs to make the umbrella headers discoverable with `use_frameworks`.

Updates the cocoapods scripts to make sure all public headers are discoverable with `use_frameworks`.

Reviewed By: cortinico

Differential Revision: D118096693

fbshipit-source-id: e31e946b745979f203804d56512a08eb2d069b08
This commit is contained in:
Jakub Piasecki authored and meta-codesync[bot] committed 2026-09-02 06:59:13 -07:00
1 parent be2c14b055
commit 8e1559a8fb
10 files changed
+44 -31

No files matched your search

@@ -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|
@@ -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|
@@ -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")
@@ -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")
@@ -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"
@@ -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|
@@ -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'}
@@ -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", []))
@@ -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"]))
@@ -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',
},