Skip to content

Fix use of XCTest minimum deployment target #6504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2023
Merged

Fix use of XCTest minimum deployment target #6504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/PackageGraph/PackageGraph+Loading.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ private func computePlatforms(
let platform = platformRegistry.platformByName[platformName]!

let minimumSupportedVersion: PlatformVersion
if usingXCTest, let xcTestMinimumDeploymentTarget = xcTestMinimumDeploymentTargets[platform] {
if usingXCTest, let xcTestMinimumDeploymentTarget = xcTestMinimumDeploymentTargets[platform], xcTestMinimumDeploymentTarget > platform.oldestSupportedVersion {
minimumSupportedVersion = xcTestMinimumDeploymentTarget
} else {
minimumSupportedVersion = platform.oldestSupportedVersion
Expand Down
16 changes: 12 additions & 4 deletions Tests/PackageGraphTests/PackageGraphTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2162,10 +2162,18 @@ class PackageGraphTests: XCTestCase {
let customXCTestMinimumDeploymentTargets = [
PackageModel.Platform.macOS: PlatformVersion("10.15"),
PackageModel.Platform.iOS: PlatformVersion("11.0"),
PackageModel.Platform.tvOS: PlatformVersion("11.0"),
PackageModel.Platform.tvOS: PlatformVersion("10.0"),
PackageModel.Platform.watchOS: PlatformVersion("4.0"),
]

let expectedPlatformsForTests = customXCTestMinimumDeploymentTargets.reduce(into: [Platform : PlatformVersion]()) { partialResult, entry in
if entry.value > entry.key.oldestSupportedVersion {
partialResult[entry.key] = entry.value
} else {
partialResult[entry.key] = entry.key.oldestSupportedVersion
}
}

do {
// One platform with an override.
let manifest = Manifest.createRootManifest(
Expand Down Expand Up @@ -2226,7 +2234,7 @@ class PackageGraphTests: XCTestCase {
result.checkTarget("test") { target in
var expected = expectedDerivedPlatforms
[PackageModel.Platform.macOS, .iOS, .tvOS, .watchOS].forEach {
expected[$0.name] = customXCTestMinimumDeploymentTargets[$0]?.versionString
expected[$0.name] = expectedPlatformsForTests[$0]?.versionString
}
target.checkDerivedPlatforms(expected)
target.checkDerivedPlatformOptions(.macOS, options: ["option1"])
Expand Down Expand Up @@ -2254,7 +2262,7 @@ class PackageGraphTests: XCTestCase {
result.checkProduct("multi-target") { product in
var expected = expectedDerivedPlatforms
[PackageModel.Platform.macOS, .iOS, .tvOS, .watchOS].forEach {
expected[$0.name] = customXCTestMinimumDeploymentTargets[$0]?.versionString
expected[$0.name] = expectedPlatformsForTests[$0]?.versionString
}
product.checkDerivedPlatforms(expected)
product.checkDerivedPlatformOptions(.macOS, options: ["option1"])
Expand Down Expand Up @@ -2358,7 +2366,7 @@ class PackageGraphTests: XCTestCase {
]

var expectedDerivedPlatforms = defaultDerivedPlatforms.merging(expectedDeclaredPlatforms, uniquingKeysWith: { lhs, rhs in rhs })
var expectedDerivedPlatformsForTests = defaultDerivedPlatforms.merging(customXCTestMinimumDeploymentTargets.map { ($0.name, $1.versionString) }, uniquingKeysWith: { lhs, rhs in rhs })
var expectedDerivedPlatformsForTests = defaultDerivedPlatforms.merging(expectedPlatformsForTests.map { ($0.name, $1.versionString) }, uniquingKeysWith: { lhs, rhs in rhs })
expectedDerivedPlatformsForTests["ios"] = expectedDeclaredPlatforms["ios"]

// Gets derived to be the same as the declared iOS deployment target.
Expand Down