Skip to content

Commit 1e512e7

Browse files
committed
[Utility] Bump SwiftPM version to 5.1
<rdar://problem/50339646>
1 parent 6f778c2 commit 1e512e7

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Sources/PackageLoading/ToolsVersionLoader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ extension Manifest {
6464
})
6565

6666
let regularManifest = packagePath.appending(component: filename)
67-
let toolsVersionLoader = ToolsVersionLoader()
67+
let toolsVersionLoader = ToolsVersionLoader(currentToolsVersion: currentToolsVersion)
6868

6969
// Find the version-specific manifest that statisfies the current tools version.
7070
if let versionSpecificCandidate = versionSpecificManifests.keys.sorted(by: >).first(where: { $0 <= currentToolsVersion }) {

Sources/SPMUtility/Versioning.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public struct Versioning {
7474

7575
/// The current version of the package manager.
7676
public static let currentVersion = SwiftVersion(
77-
version: (5, 0, 0),
77+
version: (5, 1, 0),
7878
isDevelopment: false,
7979
buildIdentifier: getBuildIdentifier())
8080

Tests/FunctionalTests/ToolsVersionTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class ToolsVersionTests: XCTestCase {
103103
_ = try SwiftPMProduct.SwiftBuild.execute([], packagePath: primaryPath)
104104
XCTFail()
105105
} catch SwiftPMProductError.executionFailure(_, _, let stderr) {
106-
XCTAssert(stderr.contains("is using Swift tools version 10000.1.0 but the installed version is 5.0.0"), stderr)
106+
XCTAssert(stderr.contains("is using Swift tools version 10000.1.0 but the installed version is \(ToolsVersion.currentToolsVersion)"), stderr)
107107
}
108108

109109
// Write the manifest with incompatible sources.
@@ -124,7 +124,7 @@ class ToolsVersionTests: XCTestCase {
124124
_ = try SwiftPMProduct.SwiftBuild.execute([], packagePath: primaryPath)
125125
XCTFail()
126126
} catch SwiftPMProductError.executionFailure(_, _, let stderr) {
127-
XCTAssertTrue(stderr.contains("package 'Primary' requires minimum Swift language version 1000 which is not supported by the current tools version (5.0.0)"), stderr)
127+
XCTAssertTrue(stderr.contains("package 'Primary' requires minimum Swift language version 1000 which is not supported by the current tools version (\(ToolsVersion.currentToolsVersion))"), stderr)
128128
}
129129

130130
try fs.writeFileContents(primaryPath.appending(component: "Package.swift")) {

Tests/PackageLoadingTests/PackageBuilderTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ class PackageBuilderTests: XCTestCase {
10371037
manifest = createManifest(
10381038
swiftVersions: [SwiftLanguageVersion(string: "6")!, SwiftLanguageVersion(string: "7")!])
10391039
PackageBuilderTester(manifest, in: fs) { result in
1040-
result.checkDiagnostic("package \'pkg\' requires minimum Swift language version 6 which is not supported by the current tools version (5.0.0)")
1040+
result.checkDiagnostic("package \'pkg\' requires minimum Swift language version 6 which is not supported by the current tools version (\(ToolsVersion.currentToolsVersion))")
10411041
}
10421042
}
10431043

Tests/PackageLoadingTests/ToolsVersionLoaderTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,17 @@ class ToolsVersionLoaderTests: XCTestCase {
156156

157157
try fs.writeFileContents(root.appending(component: "Package.swift"), bytes: "// swift-tools-version:1.0.0\n")
158158
try fs.writeFileContents(root.appending(component: "[email protected]"), bytes: "// swift-tools-version:3.4.5\n")
159-
try fs.writeFileContents(root.appending(component: "Package@swift-5.1.swift"), bytes: "// swift-tools-version:3.4.6\n")
160-
try fs.writeFileContents(root.appending(component: "Package@swift-5.2.swift"), bytes: "// swift-tools-version:3.4.7\n")
161-
try fs.writeFileContents(root.appending(component: "Package@swift-5.3.swift"), bytes: "// swift-tools-version:3.4.8\n")
159+
try fs.writeFileContents(root.appending(component: "Package@swift-15.1.swift"), bytes: "// swift-tools-version:3.4.6\n")
160+
try fs.writeFileContents(root.appending(component: "Package@swift-15.2.swift"), bytes: "// swift-tools-version:3.4.7\n")
161+
try fs.writeFileContents(root.appending(component: "Package@swift-15.3.swift"), bytes: "// swift-tools-version:3.4.8\n")
162162

163163
do {
164-
let version = try ToolsVersionLoader(currentToolsVersion: ToolsVersion(version: "5.1.1")).load(at: root, fileSystem: fs)
164+
let version = try ToolsVersionLoader(currentToolsVersion: ToolsVersion(version: "15.1.1")).load(at: root, fileSystem: fs)
165165
XCTAssertEqual(version.description, "3.4.6")
166166
}
167167

168168
do {
169-
let version = try ToolsVersionLoader(currentToolsVersion: ToolsVersion(version: "5.2.5")).load(at: root, fileSystem: fs)
169+
let version = try ToolsVersionLoader(currentToolsVersion: ToolsVersion(version: "15.2.5")).load(at: root, fileSystem: fs)
170170
XCTAssertEqual(version.description, "3.4.7")
171171
}
172172

@@ -176,7 +176,7 @@ class ToolsVersionLoaderTests: XCTestCase {
176176
}
177177

178178
do {
179-
let version = try ToolsVersionLoader(currentToolsVersion: ToolsVersion(version: "5.3.0")).load(at: root, fileSystem: fs)
179+
let version = try ToolsVersionLoader(currentToolsVersion: ToolsVersion(version: "15.3.0")).load(at: root, fileSystem: fs)
180180
XCTAssertEqual(version.description, "3.4.8")
181181
}
182182
}

0 commit comments

Comments
 (0)