Skip to content

[PackageDescription] Deprecated swiftLanguageVersion should result … #7825

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
Jul 25, 2024
Merged

[PackageDescription] Deprecated swiftLanguageVersion should result … #7825

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/PackageDescription/BuildSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ public struct SwiftSetting: Sendable {
_ condition: BuildSettingCondition? = nil
) -> SwiftSetting {
return SwiftSetting(
name: "swiftLanguageVersion", value: [.init(describing: version)], condition: condition)
name: "swiftLanguageMode", value: [.init(describing: version)], condition: condition)
}

/// Defines a `-language-mode` to pass to the
Expand Down
34 changes: 34 additions & 0 deletions Tests/PackageLoadingTests/PD_6_0_LoadingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,40 @@ final class PackageDescription6_0LoadingTests: PackageDescriptionLoadingTests {
}
}

func testSwiftLanguageModesPerTarget() async throws {
try UserToolchain.default.skipUnlessAtLeastSwift6()

let content = """
import PackageDescription
let package = Package(
name: "Foo",
defaultLocalization: "fr",
products: [],
targets: [
.target(
name: "Foo",
swiftSettings: [
.swiftLanguageMode(.v5)
]
),
.target(
name: "Bar",
swiftSettings: [
.swiftLanguageVersion(.v6)
]
)
]
)
"""

let observability = ObservabilitySystem.makeForTesting()
let (_, validationDiagnostics) = try await loadAndValidateManifest(content, observabilityScope: observability.topScope)
XCTAssertNoDiagnostics(validationDiagnostics)
testDiagnostics(observability.diagnostics) { result in
result.checkUnordered(diagnostic: .contains("'swiftLanguageVersion' is deprecated: renamed to 'swiftLanguageMode(_:_:)'"), severity: .warning)
}
}

private func loadRootManifestWithBasicGitRepository(
manifestContent: String,
validator: (Manifest, TestingObservability) throws -> ()
Expand Down
2 changes: 1 addition & 1 deletion Tests/WorkspaceTests/ManifestSourceGenerationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ final class ManifestSourceGenerationTests: XCTestCase {
try await testManifestWritingRoundTrip(manifestContents: contents, toolsVersion: .v5_9)
}

func testManifestGenerationWithSwiftLanguageVersion() async throws {
func testManifestGenerationWithSwiftLanguageMode() async throws {
try UserToolchain.default.skipUnlessAtLeastSwift6()
let manifest = Manifest.createRootManifest(
displayName: "pkg",
Expand Down