diff --git a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec index 2e2bd60415e..437a80be92c 100644 --- a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec +++ b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec @@ -84,4 +84,5 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/Libraries/Blob/React-RCTBlob.podspec b/packages/react-native/Libraries/Blob/React-RCTBlob.podspec index 427a7471909..b0cab452128 100644 --- a/packages/react-native/Libraries/Blob/React-RCTBlob.podspec +++ b/packages/react-native/Libraries/Blob/React-RCTBlob.podspec @@ -55,4 +55,5 @@ Pod::Spec.new do |s| end add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/Libraries/Image/React-RCTImage.podspec b/packages/react-native/Libraries/Image/React-RCTImage.podspec index 82e27b2c3ef..f2692e24c24 100644 --- a/packages/react-native/Libraries/Image/React-RCTImage.podspec +++ b/packages/react-native/Libraries/Image/React-RCTImage.podspec @@ -53,4 +53,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-NativeModulesApple") add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec index fbe0b69e37f..cc2f5c3d7e6 100644 --- a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -50,4 +50,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-featureflags") add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/Libraries/Network/React-RCTNetwork.podspec b/packages/react-native/Libraries/Network/React-RCTNetwork.podspec index 8ffd5c2923d..e0eaca0aefc 100644 --- a/packages/react-native/Libraries/Network/React-RCTNetwork.podspec +++ b/packages/react-native/Libraries/Network/React-RCTNetwork.podspec @@ -52,4 +52,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"]) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/Libraries/Settings/React-RCTSettings.podspec b/packages/react-native/Libraries/Settings/React-RCTSettings.podspec index 1016a81ad6c..8bd2c214f60 100644 --- a/packages/react-native/Libraries/Settings/React-RCTSettings.podspec +++ b/packages/react-native/Libraries/Settings/React-RCTSettings.podspec @@ -49,4 +49,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"]) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec b/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec index 2b8212346cb..9768c13d4b3 100644 --- a/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec +++ b/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec @@ -49,4 +49,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-NativeModulesApple") add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/React-Core.podspec b/packages/react-native/React-Core.podspec index 795801379b9..63eb78aeb59 100644 --- a/packages/react-native/React-Core.podspec +++ b/packages/react-native/React-Core.podspec @@ -83,10 +83,6 @@ Pod::Spec.new do |s| ss.exclude_files = exclude_files ss.private_header_files = "React/Cxx*/*.h" - # Include prebuilt if we're not building from source - if !ReactNativeCoreUtils.build_rncore_from_source() - ss.dependency "React-Core-prebuilt", version - end end s.subspec "DevSupport" do |ss| @@ -137,4 +133,5 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/React/CoreModules/React-CoreModules.podspec b/packages/react-native/React/CoreModules/React-CoreModules.podspec index be613510df5..6049b7d6b9f 100644 --- a/packages/react-native/React/CoreModules/React-CoreModules.podspec +++ b/packages/react-native/React/CoreModules/React-CoreModules.podspec @@ -63,4 +63,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-NativeModulesApple") add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/React/React-RCTFBReactNativeSpec.podspec b/packages/react-native/React/React-RCTFBReactNativeSpec.podspec index 0920534b444..f5ebc834cbe 100644 --- a/packages/react-native/React/React-RCTFBReactNativeSpec.podspec +++ b/packages/react-native/React/React-RCTFBReactNativeSpec.podspec @@ -61,6 +61,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.subspec "components" do |ss| ss.source_files = podspec_sources("FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/**/*.{m,mm,cpp,h}", "FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/**/*.{h}") diff --git a/packages/react-native/React/React-RCTFabric.podspec b/packages/react-native/React/React-RCTFabric.podspec index 5dd782ed308..974f046fef1 100644 --- a/packages/react-native/React/React-RCTFabric.podspec +++ b/packages/react-native/React/React-RCTFabric.podspec @@ -97,6 +97,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.test_spec 'Tests' do |test_spec| test_spec.source_files = podspec_sources("Tests/**/*.{mm}", "") diff --git a/packages/react-native/React/Runtime/React-RCTRuntime.podspec b/packages/react-native/React/Runtime/React-RCTRuntime.podspec index f0984dc0601..2b1ca69d69e 100644 --- a/packages/react-native/React/Runtime/React-RCTRuntime.podspec +++ b/packages/react-native/React/Runtime/React-RCTRuntime.podspec @@ -68,4 +68,5 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index f4756ab4af6..0a213adb955 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -32,7 +32,7 @@ Pod::Spec.new do |s| "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "DEFINES_MODULE" => "YES" } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.header_mappings_dir = './' s.module_name = 'React_Fabric' end @@ -56,6 +56,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.subspec "animations" do |ss| ss.source_files = podspec_sources("react/renderer/animations/**/*.{m,mm,cpp,h}", "react/renderer/animations/**/*.{h}") diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec index 2c9e811738b..3448123ee3f 100644 --- a/packages/react-native/ReactCommon/React-FabricComponents.podspec +++ b/packages/react-native/ReactCommon/React-FabricComponents.podspec @@ -79,6 +79,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.subspec "components" do |ss| diff --git a/packages/react-native/ReactCommon/React-FabricImage.podspec b/packages/react-native/ReactCommon/React-FabricImage.podspec index b2884cff041..0a20f733523 100644 --- a/packages/react-native/ReactCommon/React-FabricImage.podspec +++ b/packages/react-native/ReactCommon/React-FabricImage.podspec @@ -78,4 +78,5 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/React-Mapbuffer.podspec b/packages/react-native/ReactCommon/React-Mapbuffer.podspec index bd9af5b75f8..29de1623771 100644 --- a/packages/react-native/ReactCommon/React-Mapbuffer.podspec +++ b/packages/react-native/ReactCommon/React-Mapbuffer.podspec @@ -39,5 +39,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-debug") add_rn_third_party_dependencies(s) - + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/ReactCommon.podspec b/packages/react-native/ReactCommon/ReactCommon.podspec index 345d97686fe..b672e27c3a6 100644 --- a/packages/react-native/ReactCommon/ReactCommon.podspec +++ b/packages/react-native/ReactCommon/ReactCommon.podspec @@ -32,11 +32,12 @@ Pod::Spec.new do |s| "DEFINES_MODULE" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "GCC_WARN_PEDANTIC" => "YES" } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.header_mappings_dir = './' end add_rn_third_party_dependencies(s) + add_rncore_dependency(s) # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..." # Note: Update this only when ready to minimize breaking changes. diff --git a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec index 127dc2cec70..d6282664acf 100644 --- a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec +++ b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec @@ -52,4 +52,5 @@ Pod::Spec.new do |s| end add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/hermes/React-hermes.podspec b/packages/react-native/ReactCommon/hermes/React-hermes.podspec index 687d25201ec..3014edde8e8 100644 --- a/packages/react-native/ReactCommon/hermes/React-hermes.podspec +++ b/packages/react-native/ReactCommon/hermes/React-hermes.podspec @@ -48,4 +48,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"]) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec b/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec index 7510bb3db46..9433e579bdc 100644 --- a/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec +++ b/packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |s| "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.header_mappings_dir = '../' s.module_name = 'React_jserrorhandler' end @@ -49,5 +49,6 @@ Pod::Spec.new do |s| end add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/jsi/React-jsi.podspec b/packages/react-native/ReactCommon/jsi/React-jsi.podspec index 45a8697a1d6..60e18530c97 100644 --- a/packages/react-native/ReactCommon/jsi/React-jsi.podspec +++ b/packages/react-native/ReactCommon/jsi/React-jsi.podspec @@ -46,4 +46,5 @@ Pod::Spec.new do |s| s.exclude_files = files_to_exclude add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec index 6059f09ef1e..9b127209819 100644 --- a/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec +++ b/packages/react-native/ReactCommon/jsiexecutor/React-jsiexecutor.podspec @@ -41,4 +41,5 @@ Pod::Spec.new do |s| end add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec b/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec index dc6c8c37cf1..443088bcad4 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec +++ b/packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec @@ -60,4 +60,5 @@ Pod::Spec.new do |s| end add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/jsinspector-modern/cdp/React-jsinspectorcdp.podspec b/packages/react-native/ReactCommon/jsinspector-modern/cdp/React-jsinspectorcdp.podspec index 2de4f6afd63..224c512030e 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/cdp/React-jsinspectorcdp.podspec +++ b/packages/react-native/ReactCommon/jsinspector-modern/cdp/React-jsinspectorcdp.podspec @@ -41,10 +41,11 @@ Pod::Spec.new do |s| "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "DEFINES_MODULE" => "YES"} - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = module_name s.header_mappings_dir = "../.." end add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/jsinspector-modern/network/React-jsinspectornetwork.podspec b/packages/react-native/ReactCommon/jsinspector-modern/network/React-jsinspectornetwork.podspec index 91dbb1d6ce9..6f79020f0c3 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/network/React-jsinspectornetwork.podspec +++ b/packages/react-native/ReactCommon/jsinspector-modern/network/React-jsinspectornetwork.podspec @@ -41,7 +41,7 @@ Pod::Spec.new do |s| "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "DEFINES_MODULE" => "YES"} - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = module_name s.header_mappings_dir = "../.." end @@ -52,4 +52,5 @@ Pod::Spec.new do |s| s.dependency "React-timing" add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec b/packages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec index 63efbdaf465..21206aba7aa 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec +++ b/packages/react-native/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec @@ -41,7 +41,7 @@ Pod::Spec.new do |s| "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "DEFINES_MODULE" => "YES"} - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = module_name s.header_mappings_dir = "../.." end @@ -50,4 +50,5 @@ Pod::Spec.new do |s| s.dependency "React-timing" add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/jsitooling/React-jsitooling.podspec b/packages/react-native/ReactCommon/jsitooling/React-jsitooling.podspec index e6eda1f7e44..03e9ad0896c 100644 --- a/packages/react-native/ReactCommon/jsitooling/React-jsitooling.podspec +++ b/packages/react-native/ReactCommon/jsitooling/React-jsitooling.podspec @@ -28,7 +28,7 @@ Pod::Spec.new do |s| s.source_files = podspec_sources("react/runtime/*.{cpp,h}", "react/runtime/*.h") s.header_dir = "react/runtime" - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = "JSITooling" s.header_mappings_dir = "./" end @@ -46,4 +46,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing') add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/logger/React-logger.podspec b/packages/react-native/ReactCommon/logger/React-logger.podspec index cb3cbba45bc..d83e10202c6 100644 --- a/packages/react-native/ReactCommon/logger/React-logger.podspec +++ b/packages/react-native/ReactCommon/logger/React-logger.podspec @@ -30,4 +30,5 @@ Pod::Spec.new do |s| s.header_dir = "logger" add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/debug/React-debug.podspec b/packages/react-native/ReactCommon/react/debug/React-debug.podspec index ea0932fa40c..b68c407a2f4 100644 --- a/packages/react-native/ReactCommon/react/debug/React-debug.podspec +++ b/packages/react-native/ReactCommon/react/debug/React-debug.podspec @@ -30,7 +30,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "DEFINES_MODULE" => "YES" } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = "React_debug" s.header_mappings_dir = "../.." end diff --git a/packages/react-native/ReactCommon/react/featureflags/React-featureflags.podspec b/packages/react-native/ReactCommon/react/featureflags/React-featureflags.podspec index c1a55996c92..b5335894e5b 100644 --- a/packages/react-native/ReactCommon/react/featureflags/React-featureflags.podspec +++ b/packages/react-native/ReactCommon/react/featureflags/React-featureflags.podspec @@ -37,10 +37,11 @@ Pod::Spec.new do |s| "HEADER_SEARCH_PATHS" => header_search_paths.join(' '), "DEFINES_MODULE" => "YES" } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = "React_featureflags" s.header_mappings_dir = "../.." end add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec index edc219a3d51..063f0de34fc 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec @@ -31,7 +31,7 @@ Pod::Spec.new do |s| "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "GCC_WARN_PEDANTIC" => "YES" } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.header_mappings_dir = './' end @@ -51,4 +51,5 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec index 8641c8d0679..3c97b10ea0c 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec @@ -47,6 +47,7 @@ Pod::Spec.new do |s| s.dependency "React-jsiexecutor" depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.dependency "React-domnativemodule" s.dependency "React-featureflagsnativemodule" diff --git a/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec index f7b860087b7..ca55e1a8a24 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec @@ -50,6 +50,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.dependency "Yoga" s.dependency "ReactCommon/turbomodule/core" diff --git a/packages/react-native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec index 3579b4b32a9..3be0cac40b5 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec @@ -48,6 +48,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.dependency "ReactCommon/turbomodule/core" s.dependency "React-RCTFBReactNativeSpec" diff --git a/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec index 222f33f6760..d6bc746f77b 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec @@ -48,6 +48,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.dependency "ReactCommon/turbomodule/core" s.dependency "React-runtimescheduler" diff --git a/packages/react-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec index 4bfaae3f62e..df364406aff 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec @@ -48,6 +48,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.dependency "ReactCommon/turbomodule/core" add_dependency(s, "React-RCTFBReactNativeSpec") diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec index 305ab3ac1be..fc5b29a94b0 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec @@ -57,4 +57,5 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/performance/timeline/React-performancetimeline.podspec b/packages/react-native/ReactCommon/react/performance/timeline/React-performancetimeline.podspec index 0c4e9748752..9f518ff6e8b 100644 --- a/packages/react-native/ReactCommon/react/performance/timeline/React-performancetimeline.podspec +++ b/packages/react-native/ReactCommon/react/performance/timeline/React-performancetimeline.podspec @@ -38,7 +38,7 @@ Pod::Spec.new do |s| "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "HEADER_SEARCH_PATHS" => header_search_paths.join(' ')} - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = "React_performancetimeline" s.header_mappings_dir = "../../.." end @@ -49,4 +49,5 @@ Pod::Spec.new do |s| s.dependency "React-perflogger" add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/renderer/css/React-renderercss.podspec b/packages/react-native/ReactCommon/react/renderer/css/React-renderercss.podspec index ecd07167cd3..17f1d012023 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/React-renderercss.podspec +++ b/packages/react-native/ReactCommon/react/renderer/css/React-renderercss.podspec @@ -18,7 +18,7 @@ end header_search_paths = [] -if ENV['USE_FRAMEWORKS'] +if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the renderer/css access its own files end @@ -40,7 +40,7 @@ Pod::Spec.new do |s| "DEFINES_MODULE" => "YES", } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = "React_renderercss" s.header_mappings_dir = "../../.." end diff --git a/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec b/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec index 7f0216450e2..fe20e606387 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec +++ b/packages/react-native/ReactCommon/react/renderer/debug/React-rendererdebug.podspec @@ -40,11 +40,12 @@ Pod::Spec.new do |s| "DEFINES_MODULE" => "YES" } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = "React_rendererdebug" s.header_mappings_dir = "../../.." end add_dependency(s, "React-debug") add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec index 6f351f597c4..1af95039868 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec +++ b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec @@ -34,7 +34,7 @@ Pod::Spec.new do |s| s.header_dir = "react/renderer/graphics" s.framework = "UIKit" - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = "React_graphics" s.header_mappings_dir = "../../.." header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""] @@ -51,4 +51,5 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec index 412da4335dc..b21eb5b7c10 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec @@ -55,4 +55,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-rendererdebug") add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec index cfeafdc923e..ca21eafd2c0 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec @@ -38,7 +38,7 @@ Pod::Spec.new do |s| "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "HEADER_SEARCH_PATHS" => header_search_paths.join(' ')} - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = "React_runtimescheduler" s.header_mappings_dir = "../../.." end @@ -58,4 +58,5 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec b/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec index b6ea134e8fc..46c3c994495 100644 --- a/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec +++ b/packages/react-native/ReactCommon/react/runtime/React-RuntimeCore.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |s| "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "GCC_WARN_PEDANTIC" => "YES" } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.header_mappings_dir = '../../' s.module_name = 'React_RuntimeCore' end @@ -52,6 +52,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.dependency "React-jsinspector" add_dependency(s, "React-jsitooling", :framework_name => "JSITooling") diff --git a/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec b/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec index acc74f4e42d..c213513db89 100644 --- a/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec +++ b/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec @@ -32,7 +32,7 @@ Pod::Spec.new do |s| "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "GCC_WARN_PEDANTIC" => "YES" } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.header_mappings_dir = '../../' s.module_name = 'React_RuntimeHermes' end @@ -52,4 +52,5 @@ Pod::Spec.new do |s| add_dependency(s, "React-jsitooling", :framework_name => "JSITooling") add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec b/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec index ed8b6ee38a3..c40bcd43d51 100644 --- a/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec +++ b/packages/react-native/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec @@ -38,7 +38,7 @@ Pod::Spec.new do |s| "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(), "GCC_WARN_PEDANTIC" => "YES" } - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.header_mappings_dir = './' s.module_name = 'React_RuntimeApple' end @@ -71,4 +71,5 @@ Pod::Spec.new do |s| end add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/react/utils/React-utils.podspec b/packages/react-native/ReactCommon/react/utils/React-utils.podspec index 2472be4235a..27eeb6b40b6 100644 --- a/packages/react-native/ReactCommon/react/utils/React-utils.podspec +++ b/packages/react-native/ReactCommon/react/utils/React-utils.podspec @@ -34,7 +34,7 @@ Pod::Spec.new do |s| s.header_dir = "react/utils" s.exclude_files = "tests" - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.module_name = "React_utils" s.header_mappings_dir = "../.." header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""] @@ -49,6 +49,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) add_dependency(s, "React-debug") end diff --git a/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec b/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec index f8f0b70268f..fb32c2a11ea 100644 --- a/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec +++ b/packages/react-native/ReactCommon/reactperflogger/React-perflogger.podspec @@ -38,4 +38,5 @@ Pod::Spec.new do |s| } add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end diff --git a/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec b/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec index fc73fed8a16..86216f7d89b 100644 --- a/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec +++ b/packages/react-native/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |s| s.source_files = podspec_sources(["ReactCommon/*.{m,mm,cpp,h}", "platform/ios/**/*.{m,mm,cpp,h}"], ["ReactCommon/*.h", "platform/ios/**/*.h"]) s.header_dir = "ReactCommon" - if ENV['USE_FRAMEWORKS'] + if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source() s.header_mappings_dir = '.' header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""] end @@ -44,6 +44,7 @@ Pod::Spec.new do |s| "DEFINES_MODULE" => "YES" } add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.dependency "React-jsi", version add_dependency(s, "React-featureflags") diff --git a/packages/react-native/scripts/cocoapods/new_architecture.rb b/packages/react-native/scripts/cocoapods/new_architecture.rb index f3ff4b90ed1..71ba87068e8 100644 --- a/packages/react-native/scripts/cocoapods/new_architecture.rb +++ b/packages/react-native/scripts/cocoapods/new_architecture.rb @@ -132,6 +132,7 @@ class NewArchitectureHelper depend_on_js_engine(spec) add_rn_third_party_dependencies(spec) + add_rncore_dependency(spec) spec.pod_target_xcconfig = current_config end diff --git a/packages/react-native/scripts/cocoapods/rncore.rb b/packages/react-native/scripts/cocoapods/rncore.rb index a7bd337287f..6c350b0346b 100644 --- a/packages/react-native/scripts/cocoapods/rncore.rb +++ b/packages/react-native/scripts/cocoapods/rncore.rb @@ -9,6 +9,18 @@ require 'rexml/document' require_relative './utils.rb' +### Adds ReactNativeCore-prebuilt as a dependency to the given podspec if we're not +### building ReactNativeCore from source (then this function does nothing). +def add_rncore_dependency(s) + if !ReactNativeCoreUtils.build_rncore_from_source() + current_pod_target_xcconfig = s.to_hash["pod_target_xcconfig"] || {} + current_pod_target_xcconfig = current_pod_target_xcconfig.to_h unless current_pod_target_xcconfig.is_a?(Hash) + s.dependency "React-Core-prebuilt" + current_pod_target_xcconfig["HEADER_SEARCH_PATHS"] ||= [] << "$(PODS_ROOT)/React-Core-prebuilt/React.xcframework/Headers" + s.pod_target_xcconfig = current_pod_target_xcconfig + end +end + ## - RCT_USE_PREBUILT_RNCORE: If set to 1, it will use the release tarball from Maven instead of building from source. ## - RCT_TESTONLY_RNCORE_TARBALL_PATH: **TEST ONLY** If set, it will use a local tarball of RNCore if it exists. ## - RCT_TESTONLY_RNCORE_VERSION: **TEST ONLY** If set, it will override the version of RNCore to be used. diff --git a/packages/react-native/scripts/cocoapods/utils.rb b/packages/react-native/scripts/cocoapods/utils.rb index f6226b00c07..2cd7ef43725 100644 --- a/packages/react-native/scripts/cocoapods/utils.rb +++ b/packages/react-native/scripts/cocoapods/utils.rb @@ -255,18 +255,26 @@ class ReactNativePodsUtils end def self.create_header_search_path_for_frameworks(base_folder, pod_name, framework_name, additional_paths, include_base_path = true) - platforms = $RN_PLATFORMS != nil ? $RN_PLATFORMS : [] search_paths = [] - if platforms.empty?() || platforms.length() == 1 - base_path = File.join("${#{base_folder}}", pod_name, "#{framework_name}.framework", "Headers") - self.add_search_path_to_result(search_paths, base_path, additional_paths, include_base_path) - else - platforms.each { |platform| - base_path = File.join("${#{base_folder}}", "#{pod_name}-#{platform}", "#{framework_name}.framework", "Headers") + # When building using the prebuilt rncore we can't use framework folders as search paths since these aren't created + if ReactNativeCoreUtils.build_rncore_from_source() + platforms = $RN_PLATFORMS != nil ? $RN_PLATFORMS : [] + + if platforms.empty?() || platforms.length() == 1 + base_path = File.join("${#{base_folder}}", pod_name, "#{framework_name}.framework", "Headers") self.add_search_path_to_result(search_paths, base_path, additional_paths, include_base_path) - } + else + platforms.each { |platform| + base_path = File.join("${#{base_folder}}", "#{pod_name}-#{platform}", "#{framework_name}.framework", "Headers") + self.add_search_path_to_result(search_paths, base_path, additional_paths, include_base_path) + } + end + else + base_path = File.join("${PODS_ROOT}", "#{pod_name}") + self.add_search_path_to_result(search_paths, base_path, additional_paths, include_base_path) end + return search_paths end diff --git a/packages/react-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap b/packages/react-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap index 951e69765b4..49b21ae02f1 100644 --- a/packages/react-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap +++ b/packages/react-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap @@ -478,6 +478,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.script_phases = { 'name' => 'Generate Specs', @@ -955,6 +956,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.script_phases = { 'name' => 'Generate Specs', diff --git a/packages/react-native/scripts/codegen/templates/ReactCodegen.podspec.template b/packages/react-native/scripts/codegen/templates/ReactCodegen.podspec.template index 20b40fdaccb..34cf8a7c343 100644 --- a/packages/react-native/scripts/codegen/templates/ReactCodegen.podspec.template +++ b/packages/react-native/scripts/codegen/templates/ReactCodegen.podspec.template @@ -82,6 +82,7 @@ Pod::Spec.new do |s| depend_on_js_engine(s) add_rn_third_party_dependencies(s) + add_rncore_dependency(s) s.script_phases = { 'name' => 'Generate Specs', diff --git a/packages/rn-tester/RCTTest/React-RCTTest.podspec b/packages/rn-tester/RCTTest/React-RCTTest.podspec index a65d1032d41..e9676863578 100644 --- a/packages/rn-tester/RCTTest/React-RCTTest.podspec +++ b/packages/rn-tester/RCTTest/React-RCTTest.podspec @@ -41,4 +41,5 @@ Pod::Spec.new do |s| s.dependency "React-jsi", version add_rn_third_party_dependencies(s) + add_rncore_dependency(s) end