Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ let buildForDarwinPlatform = envEnable("OPENSWIFTUI_BUILD_FOR_DARWIN_PLATFORM")

// https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/3061#issuecomment-2118821061
// By-pass https://github.com/swiftlang/swift-package-manager/issues/7580
let isSPIDocGenerationBuild = envEnable("SPI_GENERATE_DOCS", default: false)
let isSPIDocGenerationBuild = envEnable("SPI_GENERATE_DOCS")

// SPI will use arm64-apple-ios instead of arm64-apple-ios-simulator for the iOS build.
// AG does not support linking with that architecture.
let isSPIBuild = envEnable("SPI_BUILD")

// MARK: - Env and Config

Expand Down Expand Up @@ -85,7 +89,7 @@ if development {

// MARK: - [env] OPENSWIFTUI_LINK_COREUI

let linkCoreUI = envEnable("OPENSWIFTUI_LINK_COREUI", default: buildForDarwinPlatform && !isSPIDocGenerationBuild)
let linkCoreUI = envEnable("OPENSWIFTUI_LINK_COREUI", default: buildForDarwinPlatform && !isSPIBuild)

if linkCoreUI {
sharedCSettings.append(
Expand Down Expand Up @@ -174,8 +178,8 @@ if !compatibilityTestCondition {

// MARK: - [env] OPENSWIFTUI_IGNORE_AVAILABILITY

let ignoreAvailability = envEnable("OPENSWIFTUI_IGNORE_AVAILABILITY", default: !isSPIDocGenerationBuild)
sharedSwiftSettings.append(contentsOf: [SwiftSetting].availabilityMacroSettings(ignoreAvailability: !isSPIDocGenerationBuild && !compatibilityTestCondition))
let ignoreAvailability = envEnable("OPENSWIFTUI_IGNORE_AVAILABILITY", default: !isSPIDocGenerationBuild && !compatibilityTestCondition)
sharedSwiftSettings.append(contentsOf: [SwiftSetting].availabilityMacroSettings(ignoreAvailability: ignoreAvailability))

// MARK: - CoreGraphicsShims Target

Expand Down Expand Up @@ -503,7 +507,7 @@ extension Target {

let useLocalDeps = envEnable("OPENSWIFTUI_USE_LOCAL_DEPS")

let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH", default: buildForDarwinPlatform && !isSPIDocGenerationBuild)
let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH", default: buildForDarwinPlatform && !isSPIBuild)
if attributeGraphCondition {
openSwiftUICoreTarget.addAGSettings()
openSwiftUITarget.addAGSettings()
Expand All @@ -515,7 +519,7 @@ if attributeGraphCondition {
openSwiftUIBridgeTestTarget.addAGSettings()
}

let renderBoxCondition = envEnable("OPENBOX_RENDERBOX", default: buildForDarwinPlatform && !isSPIDocGenerationBuild)
let renderBoxCondition = envEnable("OPENBOX_RENDERBOX", default: buildForDarwinPlatform && !isSPIBuild)
if renderBoxCondition {
openSwiftUICoreTarget.addRBSettings()
openSwiftUITarget.addRBSettings()
Expand All @@ -527,7 +531,7 @@ if renderBoxCondition {
openSwiftUIBridgeTestTarget.addRBSettings()
}

if attributeGraphCondition || renderBoxCondition || isSPIDocGenerationBuild {
if attributeGraphCondition || renderBoxCondition {
let release = Context.environment["DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE"].flatMap { Int($0) } ?? 2024
package.platforms = switch release {
case 2024: [.iOS(.v18), .macOS(.v15), .macCatalyst(.v18), .tvOS(.v18), .watchOS(.v10), .visionOS(.v2)]
Expand Down
Loading