Skip to content

Commit 96e6ae1

Browse files
bnbarhambkhouri
andauthored
Update isDevelopment check on 6.2 (#9117)
- **Explanation**: We missed flipping the `isDevelopment` flag in both 6.2 and 6.2.1 when updating the versions. This would allow development tool versions to be used in release. - **Scope**: Package manifest evaluation - **Issues**: N/A - **Original PRs**: N/A (this is specifically a release branch change) - **Risk**: Very low - this is intended to be flipped in each release - **Reviewers**: @owenv @bkhouri --------- Co-authored-by: Sam Khouri <[email protected]>
1 parent 9ec73bf commit 96e6ae1

File tree

5 files changed

+53
-4
lines changed

5 files changed

+53
-4
lines changed

Sources/Basics/SwiftVersion.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ extension SwiftVersion {
5959
/// The current version of the package manager.
6060
public static let current = SwiftVersion(
6161
version: (6, 2, 0),
62-
isDevelopment: true,
62+
isDevelopment: false,
6363
buildIdentifier: getBuildIdentifier()
6464
)
6565
}

Tests/PackageLoadingTests/PDAppleProductLoadingTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import PackageLoading
1818

1919
class PackageDescriptionAppleProductLoadingTests: PackageDescriptionLoadingTests {
2020
override var toolsVersion: ToolsVersion {
21-
.vNext
21+
.v6_0 // TODO: confirm this value
2222
}
2323

2424
func testApplicationProducts() throws {

Tests/PackageLoadingTests/PD_Next_LoadingTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import PackageModel
1616
import _InternalTestSupport
1717
import XCTest
1818

19-
class PackageDescriptionNextLoadingTests: PackageDescriptionLoadingTests {
19+
final class PackageDescriptionNextLoadingTests: PackageDescriptionLoadingTests {
2020
override var toolsVersion: ToolsVersion {
2121
.vNext
2222
}

Tests/PackageLoadingTests/TraitLoadingTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import XCTest
1818

1919
final class TraitLoadingTests: PackageDescriptionLoadingTests {
2020
override var toolsVersion: ToolsVersion {
21-
.vNext
21+
.v6_1
2222
}
2323

2424
func testTraits() async throws {

Tests/WorkspaceTests/WorkspaceTests.swift

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,57 @@ final class WorkspaceTests: XCTestCase {
227227
)
228228
"""
229229
)
230+
if SwiftVersion.current.isDevelopment {
231+
XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
232+
} else {
233+
XCTAssertThrowsError(
234+
try ws.interpreterFlags(for: packageManifest)
235+
)
236+
}
237+
}
238+
239+
do {
240+
let ws = try createWorkspace(
241+
"""
242+
// swift-tools-version:6.0
243+
import PackageDescription
244+
let package = Package(
245+
name: "foo"
246+
)
247+
"""
248+
)
249+
250+
XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
251+
}
252+
253+
do {
254+
let ws = try createWorkspace(
255+
"""
256+
// swift-tools-version:6.1
257+
import PackageDescription
258+
let package = Package(
259+
name: "foo"
260+
)
261+
"""
262+
)
263+
264+
XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-swift-version"), .equal("6")])
265+
XCTAssertMatch(try ws.interpreterFlags(for: packageManifest), [.equal("-package-description-version"), .equal("6.1.0")])
266+
}
267+
268+
do {
269+
let ws = try createWorkspace(
270+
"""
271+
// swift-tools-version:6.2
272+
import PackageDescription
273+
let package = Package(
274+
name: "foo"
275+
)
276+
"""
277+
)
230278

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

234283
do {

0 commit comments

Comments
 (0)