Update to Swift 6 (#196)

* Update to Swift 6

* Add missing flags

* Update api-docs.yml

* Update test.yml

* Address reviews

* Nits

* Comment out breaking option

* Update Package.swift

---------

Co-authored-by: Gwynne Raskind <gwynne@vapor.codes>

Author: ptoffy

.github/workflows/api-docs.yml

@@ -3,6 +3,9 @@ on:
   push:
     branches:
       - main
+permissions:
+  contents: read
+  id-token: write
 
 jobs:
   build-and-deploy:

.github/workflows/test.yml

@@ -7,7 +7,8 @@ on:
   push: { branches: [ main ] }
 env:
   LOG_LEVEL: info
-  SWIFT_DETERMINISTIC_HASHING: 1
+permissions:
+  contents: read
 
 jobs:
   unit-tests:
@@ -20,7 +21,7 @@ jobs:
   pure-fluent-integration-test:
     if: ${{ !(github.event.pull_request.draft || false) }}
     runs-on: ubuntu-latest
-    container: swift:6.1-noble
+    container: swift:6.2-noble
     steps:
       - name: Check out sql-kit
         uses: actions/checkout@v6
@@ -51,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift-image: ['swift:6.1-noble']
+        swift-image: ['swift:6.2-noble']
         driver:
           - { sqlkit: 'sqlite-kit',   fluent: 'fluent-sqlite-driver' }
           - { sqlkit: 'mysql-kit',    fluent: 'fluent-mysql-driver' }

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.10
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
@@ -48,8 +48,9 @@ let package = Package(
 
 var swiftSettings: [SwiftSetting] { [
     .enableUpcomingFeature("ExistentialAny"),
-    .enableUpcomingFeature("ConciseMagicFile"),
-    .enableUpcomingFeature("ForwardTrailingClosures"),
-    .enableUpcomingFeature("DisableOutwardActorInference"),
-    .enableExperimentalFeature("StrictConcurrency=complete"),
+    // .enableUpcomingFeature("InternalImportsByDefault"),
+    .enableUpcomingFeature("MemberImportVisibility"),
+    .enableUpcomingFeature("InferIsolatedConformances"),
+    // .enableUpcomingFeature("NonisolatedNonsendingByDefault"),
+    .enableUpcomingFeature("ImmutableWeakCaptures"),
 ] }

README.md

@@ -6,8 +6,8 @@
 <a href="https://discord.gg/vapor"><img src="https://design.vapor.codes/images/discordchat.svg" alt="Team Chat"></a>
 <a href="LICENSE"><img src="https://design.vapor.codes/images/mitlicense.svg" alt="MIT License"></a>
 <a href="https://github.com/vapor/sql-kit/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/vapor/sql-kit/test.yml?event=push&style=plastic&logo=github&label=tests&logoColor=%23ccc" alt="Continuous Integration"></a>
-<a href="https://codecov.io/github/vapor/sql-kit"><img src="https://img.shields.io/codecov/c/github/vapor/sql-kit?style=plastic&logo=codecov&label=codecov"></a>
-<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift510up.svg" alt="Swift 5.10+"></a>
+<a href="https://codecov.io/github/vapor/sql-kit"><img src="https://img.shields.io/codecov/c/github/vapor/sql-kit?style=plastic&logo=codecov&label=codecov" alt="Code Coverage"></a>
+<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift60up.svg" alt="Swift 6.0+"></a>
 </p>
 
 <br>

Sources/SQLKit/Utilities/SomeCodingKey.swift

@@ -9,7 +9,7 @@
 ///
 /// ![Quotation](codingkey-quotation)
 ///
-/// [`_DictionaryCodingKey`]: https://github.com/apple/swift/blob/swift-5.10-RELEASE/stdlib/public/core/Codable.swift#L5509
+/// [`_DictionaryCodingKey`]: https://github.com/swiftlang/swift/blob/swift-6.0-RELEASE/stdlib/public/core/Codable.swift#L6124
 /// [`CodingKeyRepresentable`]: https://developer.apple.com/documentation/swift/codingkeyrepresentable
 public struct SomeCodingKey: CodingKey, Hashable, Sendable {
     // See `CodingKey.stringValue`.

Sources/SQLKitBenchmark/SQLBenchmarker.swift

@@ -1,3 +1,5 @@
+import Logging
+import NIOCore
 import SQLKit
 import XCTest
 

Tests/SQLKitTests/AsyncTests.swift

@@ -1,3 +1,5 @@
+import NIOCore
+import OrderedCollections
 import SQLKit
 import XCTest
 

Tests/SQLKitTests/SQLCodingTests.swift

@@ -1,3 +1,4 @@
+import OrderedCollections
 @testable @_spi(CodableUtilities) import SQLKit
 import XCTest
 

Tests/SQLKitTests/SQLRowDecoderTests.swift

@@ -1,3 +1,4 @@
+import OrderedCollections
 @testable @_spi(CodableUtilities) import SQLKit
 import XCTest