Skip to content

Commit 52c075e

Browse files
cipolleschicipolleschi
committed
Make RNM work with use_frameworks
1 parent 34b8bc0 commit 52c075e

26 files changed

+148
-113
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@ header_search_paths = [
5757
"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers/",
5858
"$(PODS_CONFIGURATION_BUILD_DIR)/React-runtimescheduler/React_runtimescheduler.framework/Headers/",
5959
"$(PODS_CONFIGURATION_BUILD_DIR)/React-rendererdebug/React_rendererdebug.framework/Headers/",
60+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-Fabric-macOS/React_Fabric.framework/Headers/",
61+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-Fabric-macOS/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx/",
62+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics-macOS/React_graphics.framework/Headers/",
63+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics-macOS/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
64+
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core",
65+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers",
66+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-RuntimeApple-macOS/React_RuntimeApple.framework/Headers",
67+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-RuntimeCore-macOS/React_RuntimeCore.framework/Headers",
68+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric-macOS/RCTFabric.framework/Headers/",
69+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-utils-macOS/React_utils.framework/Headers/",
70+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug-macOS/React_debug.framework/Headers/",
71+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-runtimescheduler-macOS/React_runtimescheduler.framework/Headers/",
72+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-rendererdebug-macOS/React_rendererdebug.framework/Headers/",
6073
] : []).map{|p| "\"#{p}\""}.join(" ")
6174

6275
Pod::Spec.new do |s|

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ 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\""
25+
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen-macOS/React_Codegen.framework/Headers\""
2626
]
2727

2828
if ENV["USE_FRAMEWORKS"]
2929
header_search_paths = header_search_paths.concat([
3030
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\""
31+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\"",
32+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core\"",
33+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers\""
3234
])
3335
end
3436

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ 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\""
25+
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen-macOS/React_Codegen.framework/Headers\""
2626
]
2727

2828
if ENV["USE_FRAMEWORKS"]
2929
header_search_paths = header_search_paths.concat([
3030
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
31-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\""
31+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\"",
32+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core\"",
33+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers\""
3234
])
3335
end
3436

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ if ENV["USE_FRAMEWORKS"]
3131
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\"",
3232
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers/build/generated/ios\"",
3333
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers/build/generated/ios\"",
34-
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\""
34+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\"",
35+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core\"",
36+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers\"",
37+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers/build/generated/ios\"",
38+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen-macOS/React_Codegen.framework/Headers/build/generated/ios\"",
39+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen-macOS/React_Codegen.framework/Headers\""
3540
])
3641
end
3742

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ 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\""
25+
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",
26+
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen-macOS/React_Codegen.framework/Headers\""
2627
]
2728

2829
if ENV["USE_FRAMEWORKS"]
2930
header_search_paths = header_search_paths.concat([
3031
"\"$(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\"",
33+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core\"",
34+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers\""
3235
])
3336
end
3437

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@ 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\""
25+
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",
26+
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen-macOS/React_Codegen.framework/Headers\""
2627
]
2728

2829
if ENV["USE_FRAMEWORKS"]
2930
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\"",
31+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core\"",
32+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers\"",
33+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers/build/generated/ios\"",
34+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen-macOS/React_Codegen.framework/Headers/build/generated/ios\"",
35+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen-macOS/React_Codegen.framework/Headers\"",
3536

3637
])
3738
end

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ 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\""
25+
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen-macOS/React_Codegen.framework/Headers\""
2626
]
2727

2828
if ENV["USE_FRAMEWORKS"]
2929
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\""
30+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core\"",
31+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers\""
3232
])
3333
end
3434

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ 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\""
25+
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen-macOS/React_Codegen.framework/Headers\""
2626
]
2727

2828
if ENV["USE_FRAMEWORKS"]
2929
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\"",
30+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core\"",
31+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers\"",
32+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers/build/generated/ios\"",
33+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen-macOS/React_Codegen.framework/Headers/build/generated/ios\"",
34+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen-macOS/React_Codegen.framework/Headers\"",
3535
])
3636
end
3737

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ 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\""
25+
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen-macOS/React_Codegen.framework/Headers\""
2626
]
2727

2828
if ENV["USE_FRAMEWORKS"]
2929
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\""
30+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core\"",
31+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers\"",
32+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen-macOS/React_Codegen.framework/Headers/build/generated/ios\"",
33+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen-macOS/React_Codegen.framework/Headers\""
3434
])
3535
end
3636

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ header_subspecs = {
4141
frameworks_search_paths = []
4242
frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-hermes\"" if use_hermes
4343
frameworks_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon\"" if use_frameworks
44+
frameworks_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-macOS\"" if use_frameworks
4445
frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric\"" if use_frameworks
46+
frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric-macOS\"" if use_frameworks
4547

4648
header_search_paths = [
4749
"$(PODS_TARGET_SRCROOT)/ReactCommon",
@@ -58,7 +60,10 @@ header_search_paths = [
5860
] : []).concat(use_frameworks ? [
5961
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers",
6062
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
61-
"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers"
63+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
64+
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers",
65+
"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon-macOS/ReactCommon.framework/Headers/react/nativemodule/core",
66+
"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple-macOS/React_NativeModulesApple.framework/Headers"
6267
] : []).map{|p| "\"#{p}\""}.join(" ")
6368

6469
Pod::Spec.new do |s|

0 commit comments

Comments
 (0)