Skip to content

Commit ce09926

Browse files
authored
Update current version to 5.8 (#5903)
* Update current version to 5.8 Resolves rdar://102284175
1 parent bf9ce77 commit ce09926

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

Sources/Basics/SwiftVersion.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public struct SwiftVersion {
5454
extension SwiftVersion {
5555
/// The current version of the package manager.
5656
public static let current = SwiftVersion(
57-
version: (5, 7, 0),
57+
version: (5, 8, 0),
5858
isDevelopment: true,
5959
buildIdentifier: getBuildIdentifier()
6060
)

Sources/Build/BuildPlan.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ public final class ClangTargetBuildDescription {
386386

387387
// Enable Clang module flags, if appropriate.
388388
let enableModules: Bool
389-
if toolsVersion < .vNext {
389+
if toolsVersion < .v5_8 {
390390
// For version < 5.8, we enable them except in these cases:
391391
// 1. on Darwin when compiling for C++, because C++ modules are disabled on Apple-built Clang releases
392392
// 2. on Windows when compiling for any language, because of issues with the Windows SDK
@@ -822,7 +822,7 @@ public final class SwiftTargetBuildDescription {
822822

823823
let stream = BufferedOutputByteStream()
824824
stream <<< """
825-
\(toolsVersion < .vNext ? "import" : "@_implementationOnly import") class Foundation.Bundle
825+
\(toolsVersion < .v5_8 ? "import" : "@_implementationOnly import") class Foundation.Bundle
826826
827827
extension Foundation.Bundle {
828828
static let module: Bundle = {

Sources/PackageDescription/SupportedPlatforms.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public struct Platform: Encodable, Equatable {
6464
public static let wasi: Platform = Platform(name: "wasi")
6565

6666
/// The OpenBSD platform.
67-
@available(_PackageDescription, introduced: 999.0)
67+
@available(_PackageDescription, introduced: 5.8)
6868
public static let openbsd: Platform = Platform(name: "openbsd")
6969
}
7070

Sources/PackageModel/ToolsVersion.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public struct ToolsVersion: Equatable, Hashable, Codable {
2727
public static let v5_5 = ToolsVersion(version: "5.5.0")
2828
public static let v5_6 = ToolsVersion(version: "5.6.0")
2929
public static let v5_7 = ToolsVersion(version: "5.7.0")
30+
public static let v5_8 = ToolsVersion(version: "5.8.0")
3031
public static let vNext = ToolsVersion(version: "999.0.0")
3132

3233
/// The current tools version in use.

Sources/PackagePlugin/PackageModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public enum ModuleKind {
219219
/// A module that contains code for an executable's main module.
220220
case executable
221221
/// A module that contains code for a snippet.
222-
@available(_PackageDescription, introduced: 999.0)
222+
@available(_PackageDescription, introduced: 5.8)
223223
case snippet
224224
/// A module that contains unit tests.
225225
case test

Tests/BuildTests/BuildPlanTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ final class BuildPlanTests: XCTestCase {
6363
Manifest.createRootManifest(
6464
name: "thisPkg",
6565
path: .init(path: "/thisPkg"),
66-
toolsVersion: .vNext,
66+
toolsVersion: .v5_8,
6767
dependencies: [
6868
.localSourceControl(path: .init(path: "/fooPkg"), requirement: .upToNextMajor(from: "1.0.0")),
6969
.localSourceControl(path: .init(path: "/barPkg"), requirement: .upToNextMajor(from: "2.0.0")),
@@ -426,7 +426,7 @@ final class BuildPlanTests: XCTestCase {
426426
Manifest.createFileSystemManifest(
427427
name: "fooPkg",
428428
path: .init(path: "/fooPkg"),
429-
toolsVersion: .vNext,
429+
toolsVersion: .v5_8,
430430
products: [
431431
ProductDescription(name: "Logging", type: .library(.automatic), targets: ["FooLogging"]),
432432
],

Tests/WorkspaceTests/ManifestSourceGenerationTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,6 @@ class ManifestSourceGenerationTests: XCTestCase {
503503
let isContained = trimmedParts.allSatisfy(trimmedContents.contains(_:))
504504
XCTAssertTrue(isContained)
505505

506-
try testManifestWritingRoundTrip(manifestContents: contents, toolsVersion: .vNext)
506+
try testManifestWritingRoundTrip(manifestContents: contents, toolsVersion: .v5_8)
507507
}
508508
}

0 commit comments

Comments
 (0)