Skip to content

Commit ec48d9a

Browse files
j-piaseckifacebook-github-bot
j-piasecki
authored and
facebook-github-bot
committed
Update umbrella subspecs configuration (#58260)
Summary: 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
1 parent 3e4b340 commit ec48d9a

10 files changed

Lines changed: 44 additions & 31 deletions

File tree

‎packages/react-native/ReactCommon/React-Fabric.podspec‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ Pod::Spec.new do |s|
9090

9191
s.subspec "bridgingUmbrella" do |ss|
9292
ss.source_files = "react/renderer/bridging/React/*.h"
93-
ss.header_dir = "React"
94-
ss.header_mappings_dir = "react/renderer/bridging/React"
93+
ss.header_dir = ""
94+
ss.header_mappings_dir = "react/renderer/bridging"
9595
end
9696

9797
s.subspec "core" do |ss|
@@ -140,8 +140,8 @@ Pod::Spec.new do |s|
140140

141141
ss.subspec "rootUmbrella" do |sss|
142142
sss.source_files = "react/renderer/components/root/React/*.h"
143-
sss.header_dir = "React"
144-
sss.header_mappings_dir = "react/renderer/components/root/React"
143+
sss.header_dir = ""
144+
sss.header_mappings_dir = "react/renderer/components/root"
145145
end
146146

147147
ss.subspec "view" do |sss|
@@ -153,8 +153,8 @@ Pod::Spec.new do |s|
153153

154154
ss.subspec "viewUmbrella" do |sss|
155155
sss.source_files = "react/renderer/components/view/React/*.h"
156-
sss.header_dir = "React"
157-
sss.header_mappings_dir = "react/renderer/components/view/React"
156+
sss.header_dir = ""
157+
sss.header_mappings_dir = "react/renderer/components/view"
158158
end
159159

160160
ss.subspec "scrollview" do |sss|
@@ -165,8 +165,8 @@ Pod::Spec.new do |s|
165165

166166
ss.subspec "scrollviewUmbrella" do |sss|
167167
sss.source_files = "react/renderer/components/scrollview/React/*.h"
168-
sss.header_dir = "React"
169-
sss.header_mappings_dir = "react/renderer/components/scrollview/React"
168+
sss.header_dir = ""
169+
sss.header_mappings_dir = "react/renderer/components/scrollview"
170170
end
171171

172172
ss.subspec "legacyviewmanagerinterop" do |sss|

‎packages/react-native/ReactCommon/React-FabricComponents.podspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ Pod::Spec.new do |s|
9797

9898
ss.subspec "modalUmbrella" do |sss|
9999
sss.source_files = "react/renderer/components/modal/React/*.h"
100-
sss.header_dir = "React"
101-
sss.header_mappings_dir = "react/renderer/components/modal/React"
100+
sss.header_dir = ""
101+
sss.header_mappings_dir = "react/renderer/components/modal"
102102
end
103103

104104
ss.subspec "safeareaview" do |sss|
@@ -118,8 +118,8 @@ Pod::Spec.new do |s|
118118

119119
ss.subspec "textUmbrella" do |sss|
120120
sss.source_files = "react/renderer/components/text/React/*.h"
121-
sss.header_dir = "React"
122-
sss.header_mappings_dir = "react/renderer/components/text/React"
121+
sss.header_dir = ""
122+
sss.header_mappings_dir = "react/renderer/components/text"
123123
end
124124

125125
ss.subspec "iostextinput" do |sss|

‎packages/react-native/ReactCommon/React-FabricImage.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ Pod::Spec.new do |s|
5050
"HEADER_SEARCH_PATHS" => header_search_path.join(" ")
5151
}
5252

53-
s.subspec "ImageUmbrella" do |ss|
53+
s.subspec "imageUmbrella" do |ss|
5454
ss.source_files = "react/renderer/components/image/React/*.h"
55-
ss.header_dir = "React"
56-
ss.header_mappings_dir = "react/renderer/components/image/React"
55+
ss.header_dir = ""
56+
ss.header_mappings_dir = "react/renderer/components/image"
5757
end
5858

5959
resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_FabricImage")

‎packages/react-native/ReactCommon/React-Mapbuffer.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ Pod::Spec.new do |s|
3232
s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => ["\"$(PODS_TARGET_SRCROOT)\""], "USE_HEADERMAP" => "YES",
3333
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
3434

35-
s.subspec "MapBufferUmbrella" do |ss|
35+
s.subspec "mapbufferUmbrella" do |ss|
3636
ss.source_files = "react/renderer/mapbuffer/React/*.h"
37-
ss.header_dir = "React"
38-
ss.header_mappings_dir = "react/renderer/mapbuffer/React"
37+
ss.header_dir = ""
38+
ss.header_mappings_dir = "react/renderer/mapbuffer"
3939
end
4040

4141
resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_Mapbuffer")

‎packages/react-native/ReactCommon/callinvoker/React-callinvoker.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ Pod::Spec.new do |s|
3636
s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => header_search_paths.join(' ') }
3737
s.header_dir = "ReactCommon"
3838

39-
s.subspec "CallInvokerUmbrella" do |ss|
39+
s.subspec "callinvokerUmbrella" do |ss|
4040
ss.source_files = "React/*.h"
41-
ss.header_dir = "React"
42-
ss.header_mappings_dir = "React"
41+
ss.header_dir = ""
42+
ss.header_mappings_dir = "."
4343
end
4444

4545
s.dependency "React-cxxstableapi"

‎packages/react-native/ReactCommon/react/debug/React-debug.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ Pod::Spec.new do |s|
3939

4040
resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_debug")
4141

42-
s.subspec "DebugUmbrella" do |ss|
42+
s.subspec "debugUmbrella" do |ss|
4343
ss.source_files = "React/*.h"
44-
ss.header_dir = "React"
45-
ss.header_mappings_dir = "React"
44+
ss.header_dir = ""
45+
ss.header_mappings_dir = "."
4646
end
4747

4848
s.subspec "redbox" do |ss|

‎packages/react-native/ReactCommon/react/timing/React-timing.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Pod::Spec.new do |s|
4444

4545
s.subspec "timingUmbrella" do |ss|
4646
ss.source_files = "React/*.h"
47-
ss.header_dir = "React"
48-
ss.header_mappings_dir = "React"
47+
ss.header_dir = ""
48+
ss.header_mappings_dir = "."
4949
end
5050

5151
s.resource_bundles = {'React-timing_privacy' => 'PrivacyInfo.xcprivacy'}

‎packages/react-native/scripts/cocoapods/new_architecture.rb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version = He
8686
ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-graphics", "React_graphics", ["react/renderer/graphics/platform/ios"])
8787
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", ["react/renderer/components/view/platform/cxx"]))
8888
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-FabricImage", "React_FabricImage", []))
89+
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-FabricComponents", "React_FabricComponents", []))
90+
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Mapbuffer", "React_Mapbuffer", []))
91+
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-RCTFBReactNativeSpec", "React_RCTFBReactNativeSpec", []))
8992
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon", "ReactCommon", ["react/nativemodule/core"]))
9093
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-runtimeexecutor", "React_runtimeexecutor", ["platform/ios"]))
9194
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-NativeModulesApple", "React_NativeModulesApple", []))

‎packages/react-native/scripts/cocoapods/utils.rb‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,17 @@ def self.update_search_paths(installer)
386386
ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon", "ReactCommon", ["react/nativemodule/core"])
387387
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-runtimeexecutor", "React_runtimeexecutor", ["platform/ios"]))
388388
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon-Samples", "ReactCommon_Samples", ["platform/ios"]))
389-
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", ["react/renderer/components/view/platform/cxx"], false))
389+
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", [
390+
"react/renderer/components/view/platform/cxx",
391+
"react/renderer/components/scrollview/platform/cxx",
392+
"react/renderer/components/scrollview/platform/ios",
393+
], false))
394+
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-FabricComponents", "React_FabricComponents", [
395+
"react/renderer/textlayoutmanager/platform/ios",
396+
"react/renderer/components/text/platform/cxx",
397+
"react/renderer/components/textinput/platform/ios",
398+
"react/renderer/components/switch/iosswitch",
399+
], false))
390400
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-NativeModulesApple", "React_NativeModulesApple", []))
391401
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-bridging", "React_bridging", []))
392402
.concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-graphics", "React_graphics", ["react/renderer/graphics/platform/ios"]))

‎packages/react-native/scripts/ios-prebuild/headers-config.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
485485
headerDir: 'react/renderer/mapbuffer',
486486
subSpecs: [
487487
{
488-
name: 'MapBufferUmbrella',
488+
name: 'mapbufferUmbrella',
489489
headerPatterns: ['react/renderer/mapbuffer/React/*.h'],
490490
headerDir: 'React',
491491
},
@@ -501,7 +501,7 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
501501
headerDir: 'react/renderer/components/image',
502502
subSpecs: [
503503
{
504-
name: 'ImageUmbrella',
504+
name: 'imageUmbrella',
505505
headerPatterns: ['react/renderer/components/image/React/*.h'],
506506
headerDir: 'React',
507507
},
@@ -514,7 +514,7 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
514514
headerDir: 'ReactCommon',
515515
subSpecs: [
516516
{
517-
name: 'CallInvokerUmbrella',
517+
name: 'callinvokerUmbrella',
518518
headerPatterns: ['React/*.h'],
519519
headerDir: 'React',
520520
},
@@ -526,7 +526,7 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
526526
headerDir: 'react/debug',
527527
subSpecs: [
528528
{
529-
name: 'DebugUmbrella',
529+
name: 'debugUmbrella',
530530
headerPatterns: ['React/*.h'],
531531
headerDir: 'React',
532532
},

0 commit comments

Comments
 (0)