mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
fixed defines in package.swift (#51284)
Summary: Our Cocoapods config has a list of defines that are used mostly when setting up pods: - RCT_FABRIC_ENABLED - USE_HERMES - RCT_AGGREGATE_PRIVACY_FILES - RCT_NEW_ARCH_ENABLED - APP_PATH - REACT_NATIVE_PATH - RCT_SKIP_CODEGEN - SWIFT_ACTIVE_COMPILATION_CONDITIONS - USE_FRAMEWORKS - USE_THIRD_PARTY_JSC - HERMES_ENABLE_DEBUGGER - REACT_NATIVE_DEBUGGER_ENABLED - REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY Out of these, only the following are used in objective-c/c code: - USE_HERMES - HERMES_ENABLE_DEBUGGER - REACT_NATIVE_DEBUGGER_ENABLED - REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY This commit adds the required defines to the correct targets. ## Changelog: Pick one each for the category and type tags: [IOS] [FIXED] - fixed defines in package.swift Pull Request resolved: https://github.com/facebook/react-native/pull/51284 Test Plan: No test-plan yet Reviewed By: cortinico Differential Revision: D74872272 Pulled By: cipolleschi fbshipit-source-id: 5d9a68c1d819409bc7400ade622f62bb332d0896
This commit is contained in:
Christian Falch
committed by
Facebook GitHub Bot
Facebook GitHub Bot
parent
ccbf878fb8
commit
e2f6ce4ddf
@@ -38,13 +38,15 @@ class RNTarget: BaseTarget {
|
||||
let dependencies: [String]
|
||||
let sources: [String]?
|
||||
let publicHeadersPath: String?
|
||||
let defines: [CXXSetting]
|
||||
|
||||
init(name: String, path: String, searchPaths: [String] = [], linkedFrameworks: [String] = [], excludedPaths: [String] = [], dependencies: [String] = [], sources: [String]? = nil, publicHeadersPath: String? = ".") {
|
||||
init(name: String, path: String, searchPaths: [String] = [], linkedFrameworks: [String] = [], excludedPaths: [String] = [], dependencies: [String] = [], sources: [String]? = nil, publicHeadersPath: String? = ".", defines: [CXXSetting] = []) {
|
||||
self.linkedFrameworks = linkedFrameworks
|
||||
self.excludedPaths = excludedPaths
|
||||
self.dependencies = dependencies
|
||||
self.sources = sources
|
||||
self.publicHeadersPath = publicHeadersPath
|
||||
self.defines = defines
|
||||
|
||||
super.init(name: name, path: path, searchPaths: searchPaths)
|
||||
}
|
||||
@@ -65,7 +67,8 @@ class RNTarget: BaseTarget {
|
||||
dependencies: self.dependencies,
|
||||
sources: self.sources,
|
||||
publicHeadersPath: self.publicHeadersPath,
|
||||
linkerSettings: linkerSettings
|
||||
linkerSettings: linkerSettings,
|
||||
defines: self.defines
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -165,7 +168,11 @@ let reactJsInspectorNetwork = RNTarget(
|
||||
name: .reactJsInspectorNetwork,
|
||||
path: "ReactCommon/jsinspector-modern/network",
|
||||
searchPaths: ["ReactCommon", RuntimeExecutorPath],
|
||||
dependencies: [.reactNativeDependencies]
|
||||
dependencies: [.reactNativeDependencies],
|
||||
defines: [
|
||||
CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED", to: "1", .when(configuration: BuildConfiguration.debug)),
|
||||
CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY", to: "1", .when(configuration: BuildConfiguration.debug)),
|
||||
]
|
||||
)
|
||||
|
||||
let reactJsInspector = RNTarget(
|
||||
@@ -173,7 +180,11 @@ let reactJsInspector = RNTarget(
|
||||
path: "ReactCommon/jsinspector-modern",
|
||||
searchPaths: ["ReactCommon", RuntimeExecutorPath],
|
||||
excludedPaths: ["tracing", "network", "tests"],
|
||||
dependencies: [.reactNativeDependencies, .reactFeatureFlags, .jsi, .reactJsInspectorTracing, .reactJsInspectorNetwork]
|
||||
dependencies: [.reactNativeDependencies, .reactFeatureFlags, .jsi, .reactJsInspectorTracing, .reactJsInspectorNetwork],
|
||||
defines: [
|
||||
CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED", to: "1", .when(configuration: BuildConfiguration.debug)),
|
||||
CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY", to: "1", .when(configuration: BuildConfiguration.debug)),
|
||||
]
|
||||
)
|
||||
|
||||
let reactCxxReact = RNTarget(
|
||||
@@ -203,7 +214,10 @@ let reactHermes = RNTarget(
|
||||
path: "ReactCommon/hermes",
|
||||
searchPaths: ["ReactCommon", RuntimeExecutorPath],
|
||||
excludedPaths: ["inspector-modern/chrome/tests"],
|
||||
dependencies: [.reactNativeDependencies, .reactCxxReact, .reactJsiExecutor, .reactJsInspector, .reactJsInspectorTracing, .reactPerfLogger, .hermesPrebuilt, .jsi]
|
||||
dependencies: [.reactNativeDependencies, .reactCxxReact, .reactJsiExecutor, .reactJsInspector, .reactJsInspectorTracing, .reactPerfLogger, .hermesPrebuilt, .jsi],
|
||||
defines: [
|
||||
CXXSetting.define("HERMES_ENABLE_DEBUGGER", to: "1", .when(configuration: BuildConfiguration.debug))
|
||||
]
|
||||
)
|
||||
|
||||
let reactPerformanceTimeline = RNTarget(
|
||||
@@ -258,7 +272,7 @@ let reactTurboModuleCore = RNTarget(
|
||||
name: .reactTurboModuleCore,
|
||||
path: "ReactCommon/react/nativemodule/core",
|
||||
searchPaths: ["ReactCommon", CallInvokerPath, "ReactCommon/react/nativemodule/core", "ReactCommon/react/nativemodule/core/platform/ios"],
|
||||
excludedPaths: ["platform/android"],
|
||||
excludedPaths: ["platform/android", "iostests"],
|
||||
dependencies: [.reactNativeDependencies, .reactDebug, .reactFeatureFlags, .reactUtils, .reactPerfLogger, .reactCxxReact, .reactTurboModuleBridging, .yoga]
|
||||
)
|
||||
|
||||
@@ -331,7 +345,7 @@ let reactRuntimeApple = RNTarget(
|
||||
path: "ReactCommon/react/runtime/platform/ios",
|
||||
searchPaths: ["ReactCommon", RuntimeExecutorPath, CallInvokerPath, ReactFBReactNativeSpecPath, FBLazyVectorPath],
|
||||
excludedPaths: ["ReactCommon/RCTJscInstance.mm"],
|
||||
dependencies: [.reactNativeDependencies, .jsi, .reactPerfLogger, .reactCxxReact, .rctDeprecation, .yoga, .reactRuntime, .reactRCTFabric, .reactCoreModules, .reactTurboModuleCore, .hermesPrebuilt]
|
||||
dependencies: [.reactNativeDependencies, .jsi, .reactPerfLogger, .reactCxxReact, .rctDeprecation, .yoga, .reactRuntime, .reactRCTFabric, .reactCoreModules, .reactTurboModuleCore, .hermesPrebuilt, .reactUtils]
|
||||
)
|
||||
|
||||
let reactCore = RNTarget(
|
||||
@@ -454,7 +468,7 @@ let reactRCTAnimation = RNTarget(
|
||||
name: .reactRCTAnimation,
|
||||
path: "Libraries/NativeAnimation",
|
||||
searchPaths: ["ReactCommon", ReactFBReactNativeSpecPath, FBLazyVectorPath, CallInvokerPath],
|
||||
dependencies: [.rctTypesafety, .jsi, .reactFeatureFlags, .yoga, .reactTurboModuleCore]
|
||||
dependencies: [.reactNativeDependencies, .rctTypesafety, .jsi, .reactFeatureFlags, .yoga, .reactTurboModuleCore, .reactUtils]
|
||||
)
|
||||
|
||||
let reactRCTImage = RNTarget(
|
||||
@@ -648,7 +662,8 @@ extension Target {
|
||||
dependencies: [String] = [],
|
||||
sources: [String]? = nil,
|
||||
publicHeadersPath: String? = ".",
|
||||
linkerSettings: [LinkerSetting] = []
|
||||
linkerSettings: [LinkerSetting] = [],
|
||||
defines: [CXXSetting] = []
|
||||
) -> Target {
|
||||
let dependencies = dependencies.map { Dependency.byNameItem(name: $0, condition: nil) }
|
||||
let excludes = excludedPaths
|
||||
@@ -666,10 +681,9 @@ extension Target {
|
||||
[
|
||||
.unsafeFlags(["-std=c++20"]),
|
||||
.define("DEBUG", .when(configuration: .debug)),
|
||||
.define("NDEBUG", .when(configuration: .release)),
|
||||
.define("USE_HERMES", to: "1"),
|
||||
// TODO: T223727527 Why doesn't it pick up this when DEBUG is set??
|
||||
.define("RCT_ENABLE_INSPECTOR", to: "1", .when(configuration: .debug)),
|
||||
] + cxxCommonHeaderPaths
|
||||
] + defines + cxxCommonHeaderPaths
|
||||
|
||||
return .target(
|
||||
name: name,
|
||||
|
||||
Reference in New Issue
Block a user