Skip to content

Align --build-system xcode language mode validation with --build-system native #8313

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
Feb 27, 2025
Merged

Align --build-system xcode language mode validation with --build-system native #8313

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
3 changes: 1 addition & 2 deletions Sources/XCBuildSupport/PIFBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,7 +1819,6 @@ extension PIF.BuildSettings {

func computeEffectiveSwiftVersions(for versions: [SwiftLanguageVersion]) -> [String] {
versions
.filter { target.declaredSwiftVersions.contains($0) }
.filter { isSupportedVersion($0) }.map(\.description)
}

Expand Down Expand Up @@ -1937,7 +1936,7 @@ extension PIFGenerationError: CustomStringConvertible {
versions: let given,
supportedVersions: let supported
):
"Some of the Swift language versions used in target '\(target)' settings are supported. (given: \(given), supported: \(supported))"
"Some of the Swift language versions used in target '\(target)' settings are unsupported. (given: \(given), supported: \(supported))"
}
}
}
16 changes: 12 additions & 4 deletions Tests/XCBuildSupportTests/PIFBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2947,7 +2947,8 @@ final class PIFBuilderTests: XCTestCase {
emptyFiles:
"/Foo/Sources/foo/main.swift",
"/Foo/Sources/bar/main.swift",
"/Foo/Sources/baz/main.swift"
"/Foo/Sources/baz/main.swift",
"/Foo/Sources/qux/main.swift"
)

let observability = ObservabilitySystem.makeForTesting()
Expand All @@ -2958,7 +2959,7 @@ final class PIFBuilderTests: XCTestCase {
displayName: "Foo",
path: "/Foo",
toolsVersion: .v5_3,
swiftLanguageVersions: [.v4_2, .v5],
swiftLanguageVersions: [.v4_2],
targets: [
.init(name: "foo", dependencies: [], settings: [
.init(
Expand All @@ -2984,6 +2985,12 @@ final class PIFBuilderTests: XCTestCase {
condition: .init(platformNames: ["macOS"])
),
]),
.init(name: "qux", dependencies: [], settings: [
.init(
tool: .swift,
kind: .swiftLanguageMode(.v5)
)
]),
]
),
],
Expand All @@ -3001,13 +3008,14 @@ final class PIFBuilderTests: XCTestCase {

testDiagnostics(observability.diagnostics) { result in
result.check(
diagnostic: "Some of the Swift language versions used in target 'bar' settings are supported. (given: [6], supported: [4.2, 5])",
diagnostic: "Some of the Swift language versions used in target 'bar' settings are unsupported. (given: [6], supported: [4.2, 5])",
severity: .error
)
result.check(
diagnostic: "Some of the Swift language versions used in target 'baz' settings are supported. (given: [3], supported: [4.2, 5])",
diagnostic: "Some of the Swift language versions used in target 'baz' settings are unsupported. (given: [3], supported: [4.2, 5])",
severity: .error
)
result.checkIsEmpty()
}
}
}
Expand Down