Skip to content

Commit 5d33f03

Browse files
cipolleschicipolleschi
authored
[RN][iOS] Improve Podspec dependencies and prepare support for multiple Apple platforms (#41380)
resolved: #41353 resolved: #41354 resolved: #41355 resolved: #41356 resolved: #41357 resolved: #41358 resolved: #41359
1 parent 77123b8 commit 5d33f03

31 files changed

+505
-325
lines changed

‎packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
2121

2222
is_new_arch_enabled = ENV["RCT_NEW_ARCH_ENABLED"] == "1"
2323
use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1'
24-
use_frameworks = ENV['USE_FRAMEWORKS'] != nil
2524

2625
new_arch_enabled_flag = (is_new_arch_enabled ? " -DRCT_NEW_ARCH_ENABLED" : "")
2726
is_fabric_enabled = is_new_arch_enabled || ENV["RCT_FABRIC_ENABLED"]
@@ -43,21 +42,7 @@ header_search_paths = [
4342
].concat(use_hermes ? [
4443
"$(PODS_ROOT)/Headers/Public/React-hermes",
4544
"$(PODS_ROOT)/Headers/Public/hermes-engine"
46-
] : []).concat(use_frameworks ? [
47-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-Fabric/React_Fabric.framework/Headers/",
48-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx/",
49-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/",
50-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
51-
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
52-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
53-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-RuntimeApple/React_RuntimeApple.framework/Headers",
54-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-RuntimeCore/React_RuntimeCore.framework/Headers",
55-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric/RCTFabric.framework/Headers/",
56-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-utils/React_utils.framework/Headers/",
57-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers/",
58-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-runtimescheduler/React_runtimescheduler.framework/Headers/",
59-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-rendererdebug/React_rendererdebug.framework/Headers/",
60-
] : []).map{|p| "\"#{p}\""}.join(" ")
45+
] : [])
6146

6247
Pod::Spec.new do |s|
6348
s.name = "React-RCTAppDelegate"
@@ -87,18 +72,19 @@ Pod::Spec.new do |s|
8772
s.dependency "RCT-Folly"
8873
s.dependency "RCTRequired"
8974
s.dependency "RCTTypeSafety"
90-
s.dependency "ReactCommon/turbomodule/core"
9175
s.dependency "React-RCTNetwork"
9276
s.dependency "React-RCTImage"
93-
s.dependency "React-NativeModulesApple"
9477
s.dependency "React-CoreModules"
9578
s.dependency "React-nativeconfig"
96-
s.dependency "React-runtimescheduler"
97-
s.dependency "React-RCTFabric"
79+
80+
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
81+
add_dependency(s, "React-NativeModulesApple")
82+
add_dependency(s, "React-runtimescheduler")
83+
add_dependency(s, "React-RCTFabric", :framework_name => "RCTFabric")
9884

9985
if is_new_arch_enabled
100-
s.dependency "React-RuntimeCore"
101-
s.dependency "React-RuntimeApple"
86+
add_dependency(s, "React-RuntimeCore")
87+
add_dependency(s, "React-RuntimeApple")
10288
if use_hermes
10389
s.dependency "React-RuntimeHermes"
10490
end
@@ -111,11 +97,11 @@ Pod::Spec.new do |s|
11197
end
11298

11399
if is_new_arch_enabled
114-
s.dependency "React-Fabric"
115-
s.dependency "React-graphics"
116-
s.dependency "React-utils"
117-
s.dependency "React-debug"
118-
s.dependency "React-rendererdebug"
100+
add_dependency(s, "React-Fabric", :additional_framework_paths => ["react/renderer/components/view/platform/cxx"])
101+
add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
102+
add_dependency(s, "React-utils")
103+
add_dependency(s, "React-debug")
104+
add_dependency(s, "React-rendererdebug")
119105

120106
rel_path_from_pods_root_to_app = Pathname.new(ENV['APP_PATH']).relative_path_from(Pod::Config.instance.installation_root)
121107
rel_path_from_pods_to_app = Pathname.new(ENV['APP_PATH']).relative_path_from(File.join(Pod::Config.instance.installation_root, 'Pods'))

‎packages/react-native/Libraries/Blob/React-RCTBlob.podspec

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,8 @@ folly_version = '2022.05.16.00'
2222
header_search_paths = [
2323
"\"$(PODS_ROOT)/RCT-Folly\"",
2424
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
25-
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
2625
]
2726

28-
if ENV["USE_FRAMEWORKS"]
29-
header_search_paths = header_search_paths.concat([
30-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\""
32-
])
33-
end
34-
3527
Pod::Spec.new do |s|
3628
s.name = "React-RCTBlob"
3729
s.version = version
@@ -52,12 +44,14 @@ Pod::Spec.new do |s|
5244
}
5345

5446
s.dependency "RCT-Folly", folly_version
55-
s.dependency "React-Codegen", version
56-
s.dependency "ReactCommon/turbomodule/core", version
57-
s.dependency "React-jsi", version
58-
s.dependency "React-Core/RCTBlobHeaders", version
59-
s.dependency "React-Core/RCTWebSocket", version
60-
s.dependency "React-RCTNetwork", version
47+
s.dependency "React-jsi"
48+
s.dependency "React-Core/RCTBlobHeaders"
49+
s.dependency "React-Core/RCTWebSocket"
50+
s.dependency "React-RCTNetwork"
51+
52+
add_dependency(s, "React-Codegen")
53+
add_dependency(s, "React-NativeModulesApple")
54+
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
6155

6256
if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
6357
s.dependency "hermes-engine"

‎packages/react-native/Libraries/Image/React-RCTImage.podspec

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,8 @@ folly_version = '2022.05.16.00'
2222
header_search_paths = [
2323
"\"$(PODS_ROOT)/RCT-Folly\"",
2424
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
25-
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
2625
]
2726

28-
if ENV["USE_FRAMEWORKS"]
29-
header_search_paths = header_search_paths.concat([
30-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\""
32-
])
33-
end
3427

3528
Pod::Spec.new do |s|
3629
s.name = "React-RCTImage"
@@ -54,10 +47,13 @@ Pod::Spec.new do |s|
5447
s.framework = ["Accelerate", "UIKit"]
5548

5649
s.dependency "RCT-Folly", folly_version
57-
s.dependency "React-Codegen", version
58-
s.dependency "RCTTypeSafety", version
59-
s.dependency "ReactCommon/turbomodule/core", version
60-
s.dependency "React-jsi", version
61-
s.dependency "React-Core/RCTImageHeaders", version
62-
s.dependency "React-RCTNetwork", version
50+
s.dependency "RCTTypeSafety"
51+
s.dependency "React-jsi"
52+
s.dependency "React-Core/RCTImageHeaders"
53+
s.dependency "React-RCTNetwork"
54+
55+
add_dependency(s, "React-Codegen")
56+
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
57+
add_dependency(s, "React-NativeModulesApple")
58+
6359
end

‎packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,8 @@ folly_version = '2022.05.16.00'
2222
header_search_paths = [
2323
"\"$(PODS_ROOT)/RCT-Folly\"",
2424
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
25-
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
2625
]
2726

28-
if ENV["USE_FRAMEWORKS"]
29-
header_search_paths = header_search_paths.concat([
30-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\"",
32-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers/build/generated/ios\"",
33-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers/build/generated/ios\"",
34-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\""
35-
])
36-
end
37-
3827
Pod::Spec.new do |s|
3928
s.name = "React-RCTLinking"
4029
s.version = version
@@ -55,8 +44,11 @@ Pod::Spec.new do |s|
5544
"HEADER_SEARCH_PATHS" => header_search_paths.join(' ')
5645
}
5746

58-
s.dependency "React-Codegen", version
5947
s.dependency "React-Core/RCTLinkingHeaders", version
6048
s.dependency "ReactCommon/turbomodule/core", version
6149
s.dependency "React-jsi", version
50+
51+
add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"])
52+
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
53+
add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
6254
end

‎packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,8 @@ folly_version = '2022.05.16.00'
2222
header_search_paths = [
2323
"\"$(PODS_ROOT)/RCT-Folly\"",
2424
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
25-
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
2625
]
2726

28-
if ENV["USE_FRAMEWORKS"]
29-
header_search_paths = header_search_paths.concat([
30-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\""
32-
])
33-
end
34-
3527
Pod::Spec.new do |s|
3628
s.name = "React-RCTAnimation"
3729
s.version = version
@@ -52,9 +44,11 @@ Pod::Spec.new do |s|
5244
}
5345

5446
s.dependency "RCT-Folly", folly_version
55-
s.dependency "React-Codegen", version
56-
s.dependency "RCTTypeSafety", version
57-
s.dependency "ReactCommon/turbomodule/core", version
58-
s.dependency "React-jsi", version
59-
s.dependency "React-Core/RCTAnimationHeaders", version
47+
s.dependency "RCTTypeSafety"
48+
s.dependency "React-jsi"
49+
s.dependency "React-Core/RCTAnimationHeaders"
50+
51+
add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"])
52+
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
53+
add_dependency(s, "React-NativeModulesApple")
6054
end

‎packages/react-native/Libraries/Network/React-RCTNetwork.podspec

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,8 @@ folly_version = '2022.05.16.00'
2222
header_search_paths = [
2323
"\"$(PODS_ROOT)/RCT-Folly\"",
2424
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
25-
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
2625
]
2726

28-
if ENV["USE_FRAMEWORKS"]
29-
header_search_paths = header_search_paths.concat([
30-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\"",
32-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers/build/generated/ios\"",
33-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers/build/generated/ios\"",
34-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\"",
35-
36-
])
37-
end
38-
3927
Pod::Spec.new do |s|
4028
s.name = "React-RCTNetwork"
4129
s.version = version
@@ -57,9 +45,11 @@ Pod::Spec.new do |s|
5745
s.frameworks = "MobileCoreServices"
5846

5947
s.dependency "RCT-Folly", folly_version
60-
s.dependency "React-Codegen", version
61-
s.dependency "RCTTypeSafety", version
62-
s.dependency "ReactCommon/turbomodule/core", version
63-
s.dependency "React-jsi", version
64-
s.dependency "React-Core/RCTNetworkHeaders", version
48+
s.dependency "RCTTypeSafety"
49+
s.dependency "React-jsi"
50+
s.dependency "React-Core/RCTNetworkHeaders"
51+
52+
add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"])
53+
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
54+
add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
6555
end

‎packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,8 @@ folly_version = '2022.05.16.00'
2222
header_search_paths = [
2323
"\"$(PODS_ROOT)/RCT-Folly\"",
2424
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
25-
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
2625
]
2726

28-
if ENV["USE_FRAMEWORKS"]
29-
header_search_paths = header_search_paths.concat([
30-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\""
32-
])
33-
end
34-
3527
Pod::Spec.new do |s|
3628
s.name = "React-RCTPushNotification"
3729
s.version = version
@@ -53,9 +45,11 @@ Pod::Spec.new do |s|
5345
}
5446
s.framework = "UserNotifications"
5547

56-
s.dependency "React-Codegen", version
57-
s.dependency "RCTTypeSafety", version
58-
s.dependency "React-Core/RCTPushNotificationHeaders", version
59-
s.dependency "ReactCommon/turbomodule/core", version
60-
s.dependency "React-jsi", version
48+
s.dependency "RCTTypeSafety"
49+
s.dependency "React-Core/RCTPushNotificationHeaders"
50+
s.dependency "React-jsi"
51+
52+
add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"])
53+
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
54+
add_dependency(s, "React-NativeModulesApple")
6155
end

‎packages/react-native/Libraries/Settings/React-RCTSettings.podspec

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,8 @@ folly_version = '2022.05.16.00'
2222
header_search_paths = [
2323
"\"$(PODS_ROOT)/RCT-Folly\"",
2424
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
25-
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
2625
]
2726

28-
if ENV["USE_FRAMEWORKS"]
29-
header_search_paths = header_search_paths.concat([
30-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\"",
32-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers/build/generated/ios\"",
33-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers/build/generated/ios\"",
34-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\"",
35-
])
36-
end
37-
3827
Pod::Spec.new do |s|
3928
s.name = "React-RCTSettings"
4029
s.version = version
@@ -56,9 +45,11 @@ Pod::Spec.new do |s|
5645
}
5746

5847
s.dependency "RCT-Folly", folly_version
59-
s.dependency "React-Codegen", version
60-
s.dependency "RCTTypeSafety", version
61-
s.dependency "ReactCommon/turbomodule/core", version
62-
s.dependency "React-jsi", version
63-
s.dependency "React-Core/RCTSettingsHeaders", version
48+
s.dependency "RCTTypeSafety"
49+
s.dependency "React-jsi"
50+
s.dependency "React-Core/RCTSettingsHeaders"
51+
52+
add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"])
53+
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
54+
add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
6455
end

‎packages/react-native/Libraries/Vibration/React-RCTVibration.podspec

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,8 @@ folly_version = '2022.05.16.00'
2222
header_search_paths = [
2323
"\"$(PODS_ROOT)/RCT-Folly\"",
2424
"\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
25-
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
2625
]
2726

28-
if ENV["USE_FRAMEWORKS"]
29-
header_search_paths = header_search_paths.concat([
30-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\"",
32-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers/build/generated/ios\"",
33-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\""
34-
])
35-
end
36-
3727
Pod::Spec.new do |s|
3828
s.name = "React-RCTVibration"
3929
s.version = version
@@ -56,8 +46,10 @@ Pod::Spec.new do |s|
5646
s.frameworks = "AudioToolbox"
5747

5848
s.dependency "RCT-Folly", folly_version
59-
s.dependency "React-Codegen", version
60-
s.dependency "ReactCommon/turbomodule/core", version
61-
s.dependency "React-jsi", version
62-
s.dependency "React-Core/RCTVibrationHeaders", version
49+
s.dependency "React-jsi"
50+
s.dependency "React-Core/RCTVibrationHeaders"
51+
52+
add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"])
53+
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
54+
add_dependency(s, "React-NativeModulesApple")
6355
end

‎packages/react-native/React-Core.podspec

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ socket_rocket_version = '0.6.1'
2222
boost_compiler_flags = '-Wno-documentation'
2323

2424
use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1'
25-
use_frameworks = ENV['USE_FRAMEWORKS'] != nil
2625

2726
header_subspecs = {
2827
'CoreModulesHeaders' => 'React/CoreModules/**/*.h',
@@ -40,8 +39,6 @@ header_subspecs = {
4039

4140
frameworks_search_paths = []
4241
frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-hermes\"" if use_hermes
43-
frameworks_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon\"" if use_frameworks
44-
frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric\"" if use_frameworks
4542

4643
header_search_paths = [
4744
"$(PODS_TARGET_SRCROOT)/ReactCommon",
@@ -51,15 +48,10 @@ header_search_paths = [
5148
"$(PODS_ROOT)/RCT-Folly",
5249
"${PODS_ROOT}/Headers/Public/FlipperKit",
5350
"$(PODS_ROOT)/Headers/Public/ReactCommon",
54-
"$(PODS_ROOT)/Headers/Public/React-RCTFabric"
5551
].concat(use_hermes ? [
5652
"$(PODS_ROOT)/Headers/Public/React-hermes",
5753
"$(PODS_ROOT)/Headers/Public/hermes-engine"
58-
] : []).concat(use_frameworks ? [
59-
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers",
60-
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
61-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers"
62-
] : []).map{|p| "\"#{p}\""}.join(" ")
54+
] : [])
6355

6456
Pod::Spec.new do |s|
6557
s.name = "React-Core"

0 commit comments

Comments
 (0)