Merge pull request #11 from to4iki/swift6

Bump up to Swift6
to4iki · Nov 25, 2024 · 2a979da · 2a979da
2 parents b89f044 + c710fdf
commit 2a979da
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 34 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,36 +1,30 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 
 import PackageDescription
 
 let debugSwiftSettings: [PackageDescription.SwiftSetting] = [
-  .enableUpcomingFeature("ConciseMagicFile", .when(configuration: .debug)), // SE-0274
-  .enableUpcomingFeature("ForwardTrailingClosures", .when(configuration: .debug)), // SE-0286
-  .enableUpcomingFeature("ExistentialAny", .when(configuration: .debug)), // SE-0335
-  .enableUpcomingFeature("BareSlashRegexLiterals", .when(configuration: .debug)), // SE-0354
-  .enableUpcomingFeature("DeprecateApplicationMain", .when(configuration: .debug)), // SE-0383
-  .enableUpcomingFeature("ImportObjcForwardDeclarations", .when(configuration: .debug)), // SE-0384
-  .enableUpcomingFeature("DisableOutwardActorInference", .when(configuration: .debug)), // SE-0401
-  .enableUpcomingFeature("IsolatedDefaultValues", .when(configuration: .debug)), // SE-0411
-  .enableUpcomingFeature("GlobalConcurrency", .when(configuration: .debug)), // SE-0412
+  .enableUpcomingFeature("ExistentialAny", .when(configuration: .debug))  // SE-0335
 ]
 
 let package = Package(
   name: "ForcibleValue",
   products: [
     .library(
       name: "ForcibleValue",
-      targets: ["ForcibleValue"])
+      targets: ["ForcibleValue"]
+    )
   ],
   dependencies: [],
   targets: [
     .target(
       name: "ForcibleValue",
-      dependencies: []),
+      dependencies: []
+    ),
     .testTarget(
       name: "ForcibleValueTests",
-      dependencies: ["ForcibleValue"]),
-  ],
-  swiftLanguageVersions: [.v5]
+      dependencies: ["ForcibleValue"]
+    ),
+  ]
 )
 
 for target in package.targets {

diff --git a/Tests/ForcibleValueTests/ForcibleBoolTests.swift b/Tests/ForcibleValueTests/ForcibleBoolTests.swift
@@ -18,14 +18,24 @@ struct ForcibleBoolTests {
   }
 
   @Test(arguments: [
-    TestCase(input: false, output: false),
-    TestCase(input: true, output: true),
     TestCase(input: 0, output: false),
     TestCase(input: 1, output: true),
+  ])
+  func decodeIntSuccess(testCase: TestCase<Int, Bool>) throws {
+    let json = """
+      {
+          "value": \(testCase.input)
+      }
+      """.data(using: .utf8)
+    let target = try JSONDecoder().decode(Target.self, from: json!)
+    #expect(target.value == testCase.output)
+  }
+
+  @Test(arguments: [
     TestCase(input: "\"false\"", output: false),
     TestCase(input: "\"true\"", output: true),
   ])
-  func decodeSuccess(testCase: TestCase<Any, Bool>) throws {
+  func decodeStringSuccess(testCase: TestCase<String, Bool>) throws {
     let json = """
       {
           "value": \(testCase.input)
@@ -38,11 +48,23 @@ struct ForcibleBoolTests {
   @Test(arguments: [
     TestCase(input: -1, output: ()),
     TestCase(input: 2, output: ()),
+  ])
+  func decodeIntError(testCase: TestCase<Int, Void>) throws {
+    let json = """
+      {
+          "value": \(testCase.input)
+      }
+      """.data(using: .utf8)
+    #expect(throws: (any Error).self) {
+      try JSONDecoder().decode(Target.self, from: json!)
+    }
+  }
+
+  @Test(arguments: [
     TestCase(input: "\"f\"", output: ()),
     TestCase(input: "\"t\"", output: ()),
-    TestCase(input: 1.1, output: ()),
   ])
-  func decodeError(testCase: TestCase<Any, Void>) throws {
+  func decodeStringError(testCase: TestCase<String, Void>) throws {
     let json = """
       {
           "value": \(testCase.input)
@@ -57,7 +79,7 @@ struct ForcibleBoolTests {
     TestCase(input: nil, output: nil),
     TestCase(input: 0, output: false),
   ])
-  func decodeOptionSuccess(testCase: TestCase<Any?, Bool?>) throws {
+  func decodeOptionSuccess(testCase: TestCase<Int?, Bool?>) throws {
     let json: Data? = {
       if let input = testCase.input {
         return """
@@ -77,7 +99,7 @@ struct ForcibleBoolTests {
     TestCase(input: nil, output: false),
     TestCase(input: 1, output: true),
   ])
-  func decodeDefaultSuccess(testCase: TestCase<Any?, Bool>) throws {
+  func decodeDefaultSuccess(testCase: TestCase<Int?, Bool>) throws {
     let json: Data? = {
       if let input = testCase.input {
         return """

diff --git a/Tests/ForcibleValueTests/ForcibleNumberTests.swift b/Tests/ForcibleValueTests/ForcibleNumberTests.swift
@@ -18,10 +18,9 @@ struct ForcibleNumberTests {
   }
 
   @Test(arguments: [
-    TestCase(input: 1, output: 1),
-    TestCase(input: "\"1\"", output: 1),
+    TestCase(input: "\"1\"", output: 1)
   ])
-  func decodeSuccess(testCase: TestCase<Any, Int>) throws {
+  func decodeSuccess(testCase: TestCase<String, Int>) throws {
     let json = """
       {
           "value": \(testCase.input)
@@ -34,7 +33,7 @@ struct ForcibleNumberTests {
   @Test(arguments: [
     TestCase(input: "\"abc\"", output: ())
   ])
-  func decodeError(testCase: TestCase<Any, Void>) throws {
+  func decodeError(testCase: TestCase<String, Void>) throws {
     let json = """
       {
           "value": \(testCase.input)
@@ -49,7 +48,7 @@ struct ForcibleNumberTests {
     TestCase(input: nil, output: nil),
     TestCase(input: "\"1\"", output: 1),
   ])
-  func decodeOptionSuccess(testCase: TestCase<Any?, Int?>) throws {
+  func decodeOptionSuccess(testCase: TestCase<String?, Int?>) throws {
     let json: Data? = {
       if let input = testCase.input {
         return """
@@ -69,7 +68,7 @@ struct ForcibleNumberTests {
     TestCase(input: nil, output: 0),
     TestCase(input: "\"1\"", output: 1),
   ])
-  func decodeDefaultSuccess(testCase: TestCase<Any?, Int>) throws {
+  func decodeDefaultSuccess(testCase: TestCase<String?, Int>) throws {
     let json: Data? = {
       if let input = testCase.input {
         return """

diff --git a/Tests/ForcibleValueTests/ForcibleStringTests.swift b/Tests/ForcibleValueTests/ForcibleStringTests.swift
@@ -18,11 +18,10 @@ struct ForcibleStringTests {
   }
 
   @Test(arguments: [
-    TestCase(input: "\"string\"", output: "string"),
     TestCase(input: 1, output: "1"),
     TestCase(input: 1.1, output: "1.1"),
   ])
-  func decodeSuccess(testCase: TestCase<Any, String>) throws {
+  func decodeSuccess(testCase: TestCase<Double, String>) throws {
     let json = """
       {
           "value": \(testCase.input)
@@ -36,7 +35,7 @@ struct ForcibleStringTests {
     TestCase(input: false, output: ()),
     TestCase(input: true, output: ()),
   ])
-  func decodeError(testCase: TestCase<Any, Void>) throws {
+  func decodeError(testCase: TestCase<Bool, Void>) throws {
     let json = """
       {
           "value": \(testCase.input)
@@ -51,7 +50,7 @@ struct ForcibleStringTests {
     TestCase(input: nil, output: nil),
     TestCase(input: 1, output: "1"),
   ])
-  func decodeOptionSuccess(testCase: TestCase<Any?, String?>) throws {
+  func decodeOptionSuccess(testCase: TestCase<Int?, String?>) throws {
     let json: Data? = {
       if let input = testCase.input {
         return """
@@ -71,7 +70,7 @@ struct ForcibleStringTests {
     TestCase(input: nil, output: ""),
     TestCase(input: 1, output: "1"),
   ])
-  func decodeDefaultSuccess(testCase: TestCase<Any?, String>) throws {
+  func decodeDefaultSuccess(testCase: TestCase<Int?, String>) throws {
     let json: Data? = {
       if let input = testCase.input {
         return """

diff --git a/Tests/ForcibleValueTests/TestCase.swift b/Tests/ForcibleValueTests/TestCase.swift
@@ -1,4 +1,4 @@
-struct TestCase<Input, Output> {
+struct TestCase<Input: Sendable, Output: Sendable>: Sendable {
   let input: Input
   let output: Output
   let description: String