Merge pull request #57 from SwiftPackageIndex/Swift-6.1

Update to Swift 6.1

Author: finestructure

Sources/SPIManifest/SwiftVersion.swift

@@ -16,12 +16,12 @@ public typealias ShortVersion = String
 
 
 public enum SwiftVersion: ShortVersion, Codable, CaseIterable {
-    case v5_8 = "5.8"
     case v5_9 = "5.9"
     case v5_10 = "5.10"
     case v6_0 = "6.0"
+    case v6_1 = "6.1"
 
-    public static var latestRelease: Self { .v6_0 }
+    public static var latestRelease: Self { .v6_1 }
 
     public init?(major: Int, minor: Int) {
         self.init(rawValue: "\(major).\(minor)")

Tests/SPIManifestTests/ManifestTests.swift

@@ -254,13 +254,13 @@ class ManifestTests: XCTestCase {
             builder:
               configs:
               - documentation_targets: [t0]
-                swift_version: 5.8
+                swift_version: 5.9
             """
         )
 
         for s in SwiftVersion.allCases {
             for p in Platform.allCases {
-                if p == .macosSpm && s == .v5_8 {
+                if p == .macosSpm && s == .v5_9 {
                     XCTAssertEqual(
                         m.documentationTargets(platform: p, swiftVersion: s), ["t0"],
                         "failed for (\(p), \(s))"
@@ -282,7 +282,7 @@ class ManifestTests: XCTestCase {
             builder:
               configs:
               - documentation_targets: [t0]
-                swift_version: 5.8
+                swift_version: 5.9
               - documentation_targets: [t0]
                 platform: ios
             """
@@ -291,7 +291,7 @@ class ManifestTests: XCTestCase {
         for s in SwiftVersion.allCases {
             for p in Platform.allCases {
                 switch (p, s) {
-                    case (.iOS, .latestRelease), (.macosSpm, .v5_8):
+                    case (.iOS, .latestRelease), (.macosSpm, .v5_9):
                         XCTAssertEqual(
                             m.documentationTargets(platform: p, swiftVersion: s), ["t0"],
                             "failed for (\(p), \(s))"
@@ -322,17 +322,29 @@ class ManifestTests: XCTestCase {
                 documentation_targets:
                 - t2
               - platform: watchos
-                swift_version: 5.8
+                swift_version: 5.9
                 documentation_targets:
                 - t3
             """
         )
 
         // MUT
-        XCTAssertEqual(m.documentationTargets(platform: .watchOS, swiftVersion: .v5_8), ["t3"])
-        XCTAssertEqual(m.documentationTargets(platform: .macosSpm, swiftVersion: .v5_9), nil)
-        XCTAssertEqual(m.documentationTargets(platform: .macosSpm, swiftVersion: .v6_0), ["t0"])
-        XCTAssertEqual(m.documentationTargets(platform: .watchOS, swiftVersion: .v5_9), nil)
+        for platform in Platform.allCases {
+            for swiftVersion in SwiftVersion.allCases {
+                switch (platform, swiftVersion) {
+                    case (.macosSpm, .v6_1):
+                        XCTAssertEqual(m.documentationTargets(platform: platform, swiftVersion: swiftVersion), ["t0"])
+                    case (.iOS, .v6_1):
+                        XCTAssertEqual(m.documentationTargets(platform: platform, swiftVersion: swiftVersion), ["t1"])
+                    case (.watchOS, .v6_1):
+                        XCTAssertEqual(m.documentationTargets(platform: platform, swiftVersion: swiftVersion), ["t2"])
+                    case (.watchOS, .v5_9):
+                        XCTAssertEqual(m.documentationTargets(platform: platform, swiftVersion: swiftVersion), ["t3"])
+                    default:
+                        XCTAssertEqual(m.documentationTargets(platform: platform, swiftVersion: swiftVersion), nil)
+                }
+            }
+        }
     }
 
     func test_allDocumentationTargets() throws {

Tests/SPIManifestTests/SwiftVersionTests.swift

@@ -24,16 +24,16 @@ class SwiftVersionTests: XCTestCase {
     }
 
     func test_isLatestRelease() throws {
-        XCTAssertEqual(SwiftVersion.v5_8.isLatestRelease, false)
         XCTAssertEqual(SwiftVersion.v5_9.isLatestRelease, false)
         XCTAssertEqual(SwiftVersion.v5_10.isLatestRelease, false)
-        XCTAssertEqual(SwiftVersion.v6_0.isLatestRelease, true)
+        XCTAssertEqual(SwiftVersion.v6_0.isLatestRelease, false)
+        XCTAssertEqual(SwiftVersion.v6_1.isLatestRelease, true)
     }
 
     func test_Comparable() throws {
+        XCTAssert(SwiftVersion.v6_1 > .v6_0)
         XCTAssert(SwiftVersion.v6_0 > .v5_10)
         XCTAssert(SwiftVersion.v5_10 > .v5_9)
-        XCTAssert(SwiftVersion.v5_9 > .v5_8)
     }
 
 }