Skip to content

Update isDevelopment check on 6.2 #9117

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 2 commits into from
Sep 12, 2025
Merged

Update isDevelopment check on 6.2 #9117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76d1145
Update isDevelopment check on 6.2
bnbarham Sep 9, 2025
67f61b6
disable Development mode
bkhouri Sep 10, 2025
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/Basics/SwiftVersion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extension SwiftVersion {
/// The current version of the package manager.
public static let current = SwiftVersion(
version: (6, 2, 0),
isDevelopment: true,
isDevelopment: false,
buildIdentifier: getBuildIdentifier()
)
}
Expand Down
2 changes: 1 addition & 1 deletion Tests/PackageLoadingTests/PDAppleProductLoadingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import PackageLoading

class PackageDescriptionAppleProductLoadingTests: PackageDescriptionLoadingTests {
override var toolsVersion: ToolsVersion {
.vNext
.v6_0 // TODO: confirm this value
}

func testApplicationProducts() throws {
Expand Down
2 changes: 1 addition & 1 deletion Tests/PackageLoadingTests/PD_Next_LoadingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import PackageModel
import _InternalTestSupport
import XCTest

class PackageDescriptionNextLoadingTests: PackageDescriptionLoadingTests {
final class PackageDescriptionNextLoadingTests: PackageDescriptionLoadingTests {
override var toolsVersion: ToolsVersion {
.vNext
}
Expand Down
2 changes: 1 addition & 1 deletion Tests/PackageLoadingTests/TraitLoadingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import XCTest

final class TraitLoadingTests: PackageDescriptionLoadingTests {
override var toolsVersion: ToolsVersion {
.vNext
.v6_1
}

func testTraits() async throws {
Expand Down
49 changes: 49 additions & 0 deletions Tests/WorkspaceTests/WorkspaceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,57 @@ final class WorkspaceTests: XCTestCase {
)
"""
)
if SwiftVersion.current.isDevelopment {
XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
} else {
XCTAssertThrowsError(
try ws.interpreterFlags(for: packageManifest)
)
}
}

do {
let ws = try createWorkspace(
"""
// swift-tools-version:6.0
import PackageDescription
let package = Package(
name: "foo"
)
"""
)

XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
}

do {
let ws = try createWorkspace(
"""
// swift-tools-version:6.1
import PackageDescription
let package = Package(
name: "foo"
)
"""
)

XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-package-description-version"), .equal("6.1.0")])
}

do {
let ws = try createWorkspace(
"""
// swift-tools-version:6.2
import PackageDescription
let package = Package(
name: "foo"
)
"""
)

XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-package-description-version"), .equal("6.2.0")])
}

do {
Expand Down