From 0e775ba37803f5da3dc0caf7e8efbd227d2aa777 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Tue, 3 Jun 2025 04:12:13 -0700 Subject: [PATCH] Cleanup header search paths (#51730) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/51730 This change cleans up the header search paths that are now mostly computed starting from other informations of the target. There are still some execptions, for example for header only target for which we can't have a SwiftPM target. Therefore targets that depends on header only targets need to specify them in their search path. Plus there are a small number of other exceptions, such as some circular dependencies on header only files. We will fix them later on, by introducing separated targets ## Changelog: [Internal] - Reviewed By: cortinico Differential Revision: D75756307 fbshipit-source-id: 53f24dcb08947648c8fce5c520a949b3b896c2fa --- packages/react-native/Package.swift | 116 +++++++++++----------------- 1 file changed, 47 insertions(+), 69 deletions(-) diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift index fcecb766f54..3baa565f763 100644 --- a/packages/react-native/Package.swift +++ b/packages/react-native/Package.swift @@ -29,10 +29,10 @@ import PackageDescription // MARK: Constants declaration let react = "React" -let RuntimeExecutorPath = "ReactCommon/runtimeexecutor" -let CallInvokerPath = "ReactCommon/callinvoker" -let ReactFBReactNativeSpecPath = "React/FBReactNativeSpec" -let FBLazyVectorPath = "Libraries/FBLazyVector" +let RuntimeExecutorPath = "ReactCommon/runtimeexecutor" // header only target +let CallInvokerPath = "ReactCommon/callinvoker" // header only target +let ReactFBReactNativeSpecPath = "React/FBReactNativeSpec" // generated +let FBLazyVectorPath = "Libraries/FBLazyVector" // header only // MARK: Prebuilt Dependencies declaration let reactNativeDependencies = BinaryTarget( @@ -51,8 +51,7 @@ let hermesPrebuilt = BinaryTarget( /// RCTDeprecation.podspec let rctDeprecation = RNTarget( name: .rctDeprecation, - path: "ReactApple/Libraries/RCTFoundation/RCTDeprecation", - searchPaths: ["ReactApple"] + path: "ReactApple/Libraries/RCTFoundation/RCTDeprecation" ) // To avoid having to delete the cmake folder at the same level we provide a "wrong" public header path and instead include it using header search paths. @@ -60,36 +59,31 @@ let rctDeprecation = RNTarget( let yoga = RNTarget( name: .yoga, path: "ReactCommon/yoga", - searchPaths: ["ReactCommon/yoga"], publicHeadersPath: "yoga" ) // React-oscompat.podspec let reactOSCompat = RNTarget( name: .reactOSCompat, - path: "ReactCommon/oscompat", - searchPaths: ["ReactCommon"] + path: "ReactCommon/oscompat" ) // React-rendererconsistency.podspec let reactRendererConsistency = RNTarget( name: .reactRendererConsistency, - path: "ReactCommon/react/renderer/consistency", - searchPaths: ["ReactCommon"] + path: "ReactCommon/react/renderer/consistency" ) // React-debug.podspec let reactDebug = RNTarget( name: .reactDebug, path: "ReactCommon/react/debug", - searchPaths: ["ReactCommon"], dependencies: [.reactNativeDependencies] ) /// React-jsi.podspec let jsi = RNTarget( name: .jsi, path: "ReactCommon/jsi", - searchPaths: ["ReactCommon"], excludedPaths: ["jsi/test", "CMakeLists.txt", "jsi/CMakeLists.txt"], dependencies: [.reactNativeDependencies] ) @@ -98,7 +92,7 @@ let jsi = RNTarget( let reactUtils = RNTarget( name: .reactUtils, path: "ReactCommon/react/utils", - searchPaths: ["ReactCommon", "ReactCommon/react/utils/platform/ios"], + searchPaths: ["ReactCommon/react/utils/platform/ios"], linkedFrameworks: ["CoreFoundation"], excludedPaths: ["tests", "platform/android", "platform/cxx", "platform/windows"], dependencies: [.reactDebug, .jsi, .reactNativeDependencies] @@ -108,7 +102,6 @@ let reactUtils = RNTarget( let reactFeatureFlags = RNTarget( name: .reactFeatureFlags, path: "ReactCommon/react/featureflags", - searchPaths: ["ReactCommon"], excludedPaths: ["tests"] ) @@ -116,7 +109,6 @@ let reactFeatureFlags = RNTarget( let reactPerfLogger = RNTarget( name: .reactPerfLogger, path: "ReactCommon/reactperflogger", - searchPaths: ["ReactCommon"], excludedPaths: ["fusebox"] ) @@ -139,7 +131,6 @@ let mapbuffer = RNTarget( let reactRendererDebug = RNTarget( name: .reactRendererDebug, path: "ReactCommon/react/renderer/debug", - searchPaths: ["ReactCommon"], excludedPaths: ["tests"], dependencies: [.reactDebug, .reactNativeDependencies] ) @@ -155,7 +146,6 @@ let reactRuntimeExecutor = RNTarget( let reactJsInspectorTracing = RNTarget( name: .reactJsInspectorTracing, path: "ReactCommon/jsinspector-modern/tracing", - searchPaths: ["ReactCommon"], excludedPaths: ["tests"], dependencies: [.reactNativeDependencies, .reactFeatureFlags, .jsi, .reactOSCompat] ) @@ -164,7 +154,7 @@ let reactJsInspectorTracing = RNTarget( let reactJsInspectorNetwork = RNTarget( name: .reactJsInspectorNetwork, path: "ReactCommon/jsinspector-modern/network", - searchPaths: ["ReactCommon", RuntimeExecutorPath], + searchPaths: [RuntimeExecutorPath], dependencies: [.reactNativeDependencies], defines: [ CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED", to: "1", .when(configuration: BuildConfiguration.debug)), @@ -176,7 +166,7 @@ let reactJsInspectorNetwork = RNTarget( let reactJsInspector = RNTarget( name: .reactJsInspector, path: "ReactCommon/jsinspector-modern", - searchPaths: ["ReactCommon", RuntimeExecutorPath], + searchPaths: [RuntimeExecutorPath], excludedPaths: ["tracing", "network", "tests"], dependencies: [.reactNativeDependencies, .reactFeatureFlags, .jsi, .reactJsInspectorTracing, .reactJsInspectorNetwork], defines: [ @@ -189,7 +179,7 @@ let reactJsInspector = RNTarget( let reactCxxReact = RNTarget( name: .reactCxxReact, path: "ReactCommon/cxxreact", - searchPaths: ["ReactCommon", RuntimeExecutorPath, CallInvokerPath], + searchPaths: [RuntimeExecutorPath, CallInvokerPath], excludedPaths: ["tests", "SampleCXXModule.cpp"], dependencies: [.reactNativeDependencies, .jsi, .reactPerfLogger, .logger, .reactDebug, .reactJsInspector] ) @@ -198,7 +188,7 @@ let reactCxxReact = RNTarget( let reactJsiExecutor = RNTarget( name: .reactJsiExecutor, path: "ReactCommon/jsiexecutor", - searchPaths: ["ReactCommon", RuntimeExecutorPath], + searchPaths: [RuntimeExecutorPath], dependencies: [.reactNativeDependencies, .jsi, .reactPerfLogger, .reactCxxReact, .reactJsInspector] ) @@ -206,7 +196,7 @@ let reactJsiExecutor = RNTarget( let reactJsiTooling = RNTarget( name: .reactJsiTooling, path: "ReactCommon/jsitooling", - searchPaths: ["ReactCommon", RuntimeExecutorPath], + searchPaths: [RuntimeExecutorPath], dependencies: [.reactNativeDependencies, .reactJsInspector, .reactJsInspectorTracing, .reactCxxReact, .jsi] ) @@ -214,7 +204,7 @@ let reactJsiTooling = RNTarget( let reactHermes = RNTarget( name: .reactHermes, path: "ReactCommon/hermes", - searchPaths: ["ReactCommon", RuntimeExecutorPath], + searchPaths: [RuntimeExecutorPath], excludedPaths: ["inspector-modern/chrome/tests"], dependencies: [.reactNativeDependencies, .reactCxxReact, .reactJsiExecutor, .reactJsInspector, .reactJsInspectorTracing, .reactPerfLogger, .hermesPrebuilt, .jsi], defines: [ @@ -226,7 +216,7 @@ let reactHermes = RNTarget( let reactPerformanceTimeline = RNTarget( name: .reactPerformanceTimeline, path: "ReactCommon/react/performance/timeline", - searchPaths: ["ReactCommon", RuntimeExecutorPath], + searchPaths: [RuntimeExecutorPath], excludedPaths: ["tests"], dependencies: [.reactNativeDependencies, .reactFeatureFlags, .reactJsInspectorTracing, .reactCxxReact, .reactPerfLogger] ) @@ -235,7 +225,7 @@ let reactPerformanceTimeline = RNTarget( let reactRuntimeScheduler = RNTarget( name: .reactRuntimeScheduler, path: "ReactCommon/react/renderer/runtimescheduler", - searchPaths: ["ReactCommon", RuntimeExecutorPath, CallInvokerPath], + searchPaths: [RuntimeExecutorPath, CallInvokerPath], excludedPaths: ["tests"], dependencies: [.reactNativeDependencies, .reactFeatureFlags, .reactCxxReact, .reactPerfLogger, .reactPerformanceTimeline, .reactRendererConsistency, .reactUtils, .reactRuntimeExecutor] ) @@ -245,7 +235,7 @@ let reactRuntimeScheduler = RNTarget( let reactTurboModuleBridging = RNTarget( name: .reactTurboModuleBridging, path: "ReactCommon/react/bridging", - searchPaths: ["ReactCommon", CallInvokerPath], + searchPaths: [CallInvokerPath], excludedPaths: ["tests"], dependencies: [.reactNativeDependencies, .reactPerfLogger, .reactCxxReact, .jsi, .logger] ) @@ -254,7 +244,7 @@ let reactTurboModuleBridging = RNTarget( let reactJsErrorHandler = RNTarget( name: .reactJsErrorHandler, path: "ReactCommon/jserrorhandler", - searchPaths: ["ReactCommon", CallInvokerPath], + searchPaths: [CallInvokerPath], excludedPaths: ["tests"], dependencies: [.reactNativeDependencies, .jsi, .reactCxxReact, .reactFeatureFlags, .reactDebug, .reactTurboModuleBridging] ) @@ -264,7 +254,6 @@ let reactJsErrorHandler = RNTarget( let reactGraphicsApple = RNTarget( name: .reactGraphicsApple, path: "ReactCommon/react/renderer/graphics/platform/ios", - searchPaths: ["ReactCommon"], linkedFrameworks: ["UIKit", "CoreGraphics"], dependencies: [.reactDebug, .jsi, .reactUtils, .reactNativeDependencies] ) @@ -273,7 +262,6 @@ let reactGraphicsApple = RNTarget( let reactGraphics = RNTarget( name: .reactGraphics, path: "ReactCommon/react/renderer/graphics", - searchPaths: ["ReactCommon"], excludedPaths: ["platform", "tests"], dependencies: [.reactNativeDependencies, .jsi, .reactJsiExecutor, .reactRendererDebug, .reactUtils, .reactGraphicsApple] ) @@ -283,7 +271,7 @@ let reactGraphics = RNTarget( let reactTurboModuleCore = RNTarget( name: .reactTurboModuleCore, path: "ReactCommon/react/nativemodule/core", - searchPaths: ["ReactCommon", CallInvokerPath, "ReactCommon/react/nativemodule/core", "ReactCommon/react/nativemodule/core/platform/ios"], + searchPaths: [CallInvokerPath, "ReactCommon/react/nativemodule/core/platform/ios"], excludedPaths: ["platform/android", "iostests"], dependencies: [.reactNativeDependencies, .reactDebug, .reactFeatureFlags, .reactUtils, .reactPerfLogger, .reactCxxReact, .reactTurboModuleBridging, .yoga] ) @@ -292,7 +280,7 @@ let reactTurboModuleCore = RNTarget( let reactTurboModuleCoreDefaults = RNTarget( name: .reactTurboModuleCoreDefaults, path: "ReactCommon/react/nativemodule/defaults", - searchPaths: ["ReactCommon", CallInvokerPath, ReactFBReactNativeSpecPath], + searchPaths: [CallInvokerPath, ReactFBReactNativeSpecPath], dependencies: [.reactNativeDependencies, .jsi, .reactJsiExecutor, .reactTurboModuleCore] ) @@ -300,7 +288,7 @@ let reactTurboModuleCoreDefaults = RNTarget( let reactTurboModuleCoreMicrotasks = RNTarget( name: .reactTurboModuleCoreMicrotasks, path: "ReactCommon/react/nativemodule/microtasks", - searchPaths: ["ReactCommon", CallInvokerPath, ReactFBReactNativeSpecPath], + searchPaths: [CallInvokerPath, ReactFBReactNativeSpecPath], dependencies: [.reactNativeDependencies, .reactDebug, .reactFeatureFlags, .reactUtils, .reactPerfLogger, .reactCxxReact, .reactTurboModuleCore] ) @@ -308,7 +296,7 @@ let reactTurboModuleCoreMicrotasks = RNTarget( let reactIdleCallbacksNativeModule = RNTarget( name: .reactIdleCallbacksNativeModule, path: "ReactCommon/react/nativemodule/idlecallbacks", - searchPaths: ["ReactCommon", CallInvokerPath, RuntimeExecutorPath, ReactFBReactNativeSpecPath], + searchPaths: [CallInvokerPath, RuntimeExecutorPath, ReactFBReactNativeSpecPath], dependencies: [.reactNativeDependencies, .reactDebug, .reactFeatureFlags, .reactUtils, .reactPerfLogger, .reactCxxReact, .reactTurboModuleCore] ) @@ -316,7 +304,7 @@ let reactIdleCallbacksNativeModule = RNTarget( let reactFeatureflagsNativemodule = RNTarget( name: .reactFeatureflagsNativemodule, path: "ReactCommon/react/nativemodule/featureflags", - searchPaths: ["ReactCommon", CallInvokerPath, RuntimeExecutorPath, ReactFBReactNativeSpecPath], + searchPaths: [CallInvokerPath, RuntimeExecutorPath, ReactFBReactNativeSpecPath], dependencies: [.reactNativeDependencies, .reactDebug, .reactFeatureFlags, .reactUtils, .reactPerfLogger, .reactCxxReact, .reactTurboModuleCore] ) @@ -324,7 +312,7 @@ let reactFeatureflagsNativemodule = RNTarget( let reactNativeModuleDom = RNTarget( name: .reactNativeModuleDom, path: "ReactCommon/react/nativemodule/dom", - searchPaths: ["ReactCommon", CallInvokerPath, RuntimeExecutorPath, ReactFBReactNativeSpecPath], + searchPaths: [CallInvokerPath, RuntimeExecutorPath, ReactFBReactNativeSpecPath], dependencies: [.reactNativeDependencies, .reactDebug, .reactFeatureFlags, .reactUtils, .reactPerfLogger, .reactCxxReact, .reactTurboModuleCore, .yoga, .reactGraphicsApple, .reactFabric] ) @@ -332,7 +320,7 @@ let reactNativeModuleDom = RNTarget( let rctTypesafety = RNTarget( name: .rctTypesafety, path: "Libraries/Typesafety", - searchPaths: ["ReactCommon", FBLazyVectorPath], + searchPaths: [FBLazyVectorPath], dependencies: [.reactNativeDependencies, .yoga] ) @@ -347,7 +335,7 @@ let reactCoreRCTWebsocket = RNTarget( let reactCoreModules = RNTarget( name: .reactCoreModules, path: "React/CoreModules", - searchPaths: ["ReactCommon", ReactFBReactNativeSpecPath, FBLazyVectorPath, RuntimeExecutorPath, CallInvokerPath], + searchPaths: [ReactFBReactNativeSpecPath, FBLazyVectorPath, RuntimeExecutorPath, CallInvokerPath], excludedPaths: ["PlatformStubs/RCTStatusBarManager.mm"], dependencies: [.reactNativeDependencies, .jsi, .yoga, .reactTurboModuleCore] ) @@ -357,7 +345,7 @@ let reactCoreModules = RNTarget( let reactRuntime = RNTarget( name: .reactRuntime, path: "ReactCommon/react/runtime", - searchPaths: ["ReactCommon", RuntimeExecutorPath, CallInvokerPath], + searchPaths: [RuntimeExecutorPath, CallInvokerPath], excludedPaths: ["tests", "iostests", "platform"], dependencies: [.reactNativeDependencies, .jsi, .reactJsiExecutor, .reactCxxReact, .reactJsErrorHandler, .reactPerformanceTimeline, .reactUtils, .reactFeatureFlags, .reactJsInspector, .reactJsiTooling, .reactHermes, .reactRuntimeScheduler, .hermesPrebuilt] ) @@ -366,7 +354,7 @@ let reactRuntime = RNTarget( let reactRuntimeApple = RNTarget( name: .reactRuntimeApple, path: "ReactCommon/react/runtime/platform/ios", - searchPaths: ["ReactCommon", RuntimeExecutorPath, CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], + searchPaths: [RuntimeExecutorPath, CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], excludedPaths: ["ReactCommon/RCTJscInstance.mm", "ReactCommon/metainternal"], dependencies: [.reactNativeDependencies, .jsi, .reactPerfLogger, .reactCxxReact, .rctDeprecation, .yoga, .reactRuntime, .reactRCTFabric, .reactCoreModules, .reactTurboModuleCore, .hermesPrebuilt, .reactUtils] ) @@ -375,7 +363,15 @@ let reactRuntimeApple = RNTarget( let reactCore = RNTarget( name: .reactCore, path: "React", - searchPaths: ["ReactCommon", RuntimeExecutorPath, CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath, "React/I18n", "React/Profiler", "ReactCommon/react/runtime/platform/ios"], + searchPaths: [ + RuntimeExecutorPath, + CallInvokerPath, + ReactFBReactNativeSpecPath, + FBLazyVectorPath, + "React/I18n", + "React/Profiler", + "ReactCommon/react/runtime/platform/ios", // explicit header search path to break circular dependency. RCTHost imports `RCTDefines.h` in ReactCore, ReacCore needs to import RCTHost + ], linkedFrameworks: ["CoreServices"], excludedPaths: ["Fabric", "Tests", "Resources", "Runtime/RCTJscInstanceFactory.mm", "I18n/strings", "CxxBridge/JSCExecutorFactory.mm", "CoreModules"], dependencies: [.reactNativeDependencies, .reactCxxReact, .reactPerfLogger, .jsi, .reactJsiExecutor, .reactUtils, .reactFeatureFlags, .reactRuntimeScheduler, .yoga, .reactJsInspector, .reactJsiTooling, .rctDeprecation, .reactCoreRCTWebsocket, .reactRCTImage, .reactTurboModuleCore, .reactRCTText, .reactRCTBlob, .reactRCTAnimation, .reactRCTNetwork, .reactFabric, .hermesPrebuilt], @@ -387,14 +383,8 @@ let reactFabric = RNTarget( name: .reactFabric, path: "ReactCommon/react/renderer", searchPaths: [ - "ReactCommon", RuntimeExecutorPath, CallInvokerPath, - "ReactCommon/react/renderer/components/view", - "ReactCommon/react/renderer/components/view/platform/cxx", - "ReactCommon/react/renderer/imagemanager/platform/ios", - "ReactCommon/react/renderer/components/scrollview/", - "ReactCommon/react/renderer/components/scrollview/platform/cxx", ], excludedPaths: [ "animations/tests", @@ -427,14 +417,14 @@ let reactFabric = RNTarget( "components/root/tests", ], dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga], - sources: ["animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/scrollview", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"] + sources: ["animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"] ) /// React-RCTFabric.podspec let reactRCTFabric = RNTarget( name: .reactRCTFabric, path: "React/Fabric", - searchPaths: ["ReactCommon", RuntimeExecutorPath, CallInvokerPath], + searchPaths: [RuntimeExecutorPath, CallInvokerPath], dependencies: [.reactNativeDependencies, .reactCore, .reactRCTImage, .yoga, .reactRCTText, .jsi, .reactFabricComponents, .reactGraphics, .reactImageManager, .reactDebug, .reactUtils, .reactPerformanceTimeline, .reactRendererDebug, .reactRendererConsistency, .reactRuntimeScheduler, .reactRCTAnimation, .reactJsInspector, .reactJsInspectorNetwork, .reactJsInspectorTracing, .reactFabric, .reactFabricImage] ) @@ -442,15 +432,6 @@ let reactRCTFabric = RNTarget( let reactFabricComponents = RNTarget( name: .reactFabricComponents, path: "ReactCommon/react/renderer", - searchPaths: [ - "ReactCommon", - "ReactCommon/react/renderer/components/view/platform/cxx", - "ReactCommon/react/renderer/components/text", - "ReactCommon/react/renderer/components/text/platform/cxx", - "ReactCommon/react/renderer/components/textinput/platform/ios", - "ReactCommon/react/renderer/textlayoutmanager/platform/ios", - "ReactCommon/react/renderer/textlayoutmanager", - ], excludedPaths: [ "components/view/platform/android", "components/view/platform/windows", @@ -473,7 +454,6 @@ let reactFabricComponents = RNTarget( let reactFabricImage = RNTarget( name: .reactFabricImage, path: "ReactCommon/react/renderer/components/image", - searchPaths: ["ReactCommon"], excludedPaths: ["tests"], dependencies: [.reactNativeDependencies, .reactFabric, .reactCore, .reactJsiExecutor, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .yoga, .reactRendererDebug, .reactGraphics, .reactTurboModuleBridging, .reactImageManagerApple] ) @@ -482,7 +462,6 @@ let reactFabricImage = RNTarget( let reactImageManagerApple = RNTarget( name: .reactImageManagerApple, path: "ReactCommon/react/renderer/imagemanager/platform/ios", - searchPaths: ["ReactCommon"], dependencies: [.reactNativeDependencies, .reactGraphics, .reactDebug, .reactUtils, .reactRendererDebug, .reactImageManager, .reactRCTImage, .reactCore, .yoga] ) @@ -490,7 +469,6 @@ let reactImageManagerApple = RNTarget( let reactImageManager = RNTarget( name: .reactImageManager, path: "ReactCommon/react/renderer/imagemanager", - searchPaths: ["ReactCommon"], excludedPaths: ["platform", "tests"], dependencies: [.reactNativeDependencies, .reactGraphics, .reactDebug, .reactUtils, .reactRendererDebug, .yoga] ) @@ -499,7 +477,7 @@ let reactImageManager = RNTarget( let reactRCTAnimation = RNTarget( name: .reactRCTAnimation, path: "Libraries/NativeAnimation", - searchPaths: ["ReactCommon", ReactFBReactNativeSpecPath, FBLazyVectorPath, CallInvokerPath], + searchPaths: [ReactFBReactNativeSpecPath, FBLazyVectorPath, CallInvokerPath], dependencies: [.reactNativeDependencies, .rctTypesafety, .jsi, .reactFeatureFlags, .yoga, .reactTurboModuleCore, .reactUtils] ) @@ -507,7 +485,7 @@ let reactRCTAnimation = RNTarget( let reactRCTImage = RNTarget( name: .reactRCTImage, path: "Libraries/Image", - searchPaths: ["ReactCommon", CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], + searchPaths: [CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], linkedFrameworks: ["Accelerate"], dependencies: [.rctTypesafety, .jsi, .yoga, .reactTurboModuleBridging, .reactTurboModuleCore] ) @@ -516,7 +494,7 @@ let reactRCTImage = RNTarget( let reactRCTText = RNTarget( name: .reactRCTText, path: "Libraries/Text", - searchPaths: ["ReactCommon", CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], + searchPaths: [CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], dependencies: [.yoga, .reactTurboModuleCore] ) @@ -524,7 +502,7 @@ let reactRCTText = RNTarget( let reactRCTBlob = RNTarget( name: .reactRCTBlob, path: "Libraries/Blob", - searchPaths: ["ReactCommon", CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], + searchPaths: [CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], dependencies: [.yoga, .jsi, .reactTurboModuleCore] ) @@ -532,7 +510,7 @@ let reactRCTBlob = RNTarget( let reactRCTNetwork = RNTarget( name: .reactRCTNetwork, path: "Libraries/Network", - searchPaths: ["ReactCommon", CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], + searchPaths: [CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], dependencies: [.yoga, .jsi, .reactTurboModuleCore] ) @@ -540,7 +518,7 @@ let reactRCTNetwork = RNTarget( let reactAppDelegate = RNTarget( name: .reactAppDelegate, path: "Libraries/AppDelegate", - searchPaths: ["ReactCommon", RuntimeExecutorPath, CallInvokerPath], + searchPaths: [RuntimeExecutorPath, CallInvokerPath], dependencies: [.reactNativeDependencies, .jsi, .reactJsiExecutor, .reactRuntime, .reactRCTImage, .reactHermes, .reactCore, .reactFabric, .reactTurboModuleCore, .hermesPrebuilt, .yoga] ) @@ -548,7 +526,7 @@ let reactAppDelegate = RNTarget( let reactRCTLinking = RNTarget( name: .reactRCTLinking, path: "Libraries/LinkingIOS", - searchPaths: ["ReactCommon", CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], + searchPaths: [CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath], dependencies: [.jsi, .reactTurboModuleCore] ) @@ -556,7 +534,7 @@ let reactRCTLinking = RNTarget( let reactSettings = RNTarget( name: .reactSettings, path: "Libraries/Settings", - searchPaths: ["ReactCommon", ReactFBReactNativeSpecPath, FBLazyVectorPath], + searchPaths: [ReactFBReactNativeSpecPath, FBLazyVectorPath], dependencies: [.reactTurboModuleCore, .yoga] )