Adopt Async Shutdown (#221)

* Drop support for Swift 5.8

* Update dependencies

* Adopt new APIs

* Fix some warnings in Swift 6

* Update CI

Author: 0xTim

.github/workflows/test.yml

@@ -45,15 +45,15 @@ jobs:
           - postgres-image-a: 'postgres:13'
             postgres-image-b: 'postgres:14'
             postgres-auth: 'trust'
-            swift-image: 'swift:5.8-focal'
+            swift-image: 'swift:5.9-focal'
           - postgres-image-a: 'postgres:15'
             postgres-image-b: 'postgres:16'
             postgres-auth: 'md5'
             swift-image: 'swift:5.10-jammy'
           - postgres-image-a: 'postgres:15'
             postgres-image-b: 'postgres:16'
             postgres-auth: 'scram-sha-256'
-            swift-image: 'swiftlang/swift:nightly-6.0-jammy'
+            swift-image: 'swift:6.0-jammy'
     container: ${{ matrix.swift-image }}
     runs-on: ubuntu-latest
     services:
@@ -89,8 +89,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - macos-version: macos-13
-            xcode-version: '~14.3'
           - macos-version: macos-14
             xcode-version: latest
     runs-on: ${{ matrix.macos-version }}

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
@@ -13,8 +13,8 @@ let package = Package(
         .library(name: "FluentPostgresDriver", targets: ["FluentPostgresDriver"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/async-kit.git", from: "1.19.0"),
-        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.48.4"),
+        .package(url: "https://github.com/vapor/async-kit.git", from: "1.20.0"),
+        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.49.0"),
         .package(url: "https://github.com/vapor/postgres-kit.git", from: "2.13.4"),
     ],
     targets: [
@@ -40,6 +40,9 @@ let package = Package(
 )
 
 var swiftSettings: [SwiftSetting] { [
+    .enableUpcomingFeature("ExistentialAny"),
     .enableUpcomingFeature("ConciseMagicFile"),
     .enableUpcomingFeature("ForwardTrailingClosures"),
+    .enableUpcomingFeature("DisableOutwardActorInference"),
+    .enableExperimentalFeature("StrictConcurrency=complete"),
 ] }

[email protected]

@@ -27,4 +27,8 @@ struct _FluentPostgresDriver<E: PostgresJSONEncoder, D: PostgresJSONDecoder>: Da
     func shutdown() {
         try? self.pool.syncShutdownGracefully()
     }
+    
+    func shutdownAsync() async {
+        try? await self.pool.shutdownAsync()
+    }
 }

Sources/FluentPostgresDriver/FluentPostgresDriver.swift

@@ -71,7 +71,8 @@ fileprivate extension PostgresError.Code {
     }
 }
 
-extension PostgresError: DatabaseError {
+// Used for DatabaseError conformance
+extension PostgresError {
     public var isSyntaxError: Bool { self.code.isSyntaxError }
     public var isConnectionClosed: Bool {
         switch self {
@@ -82,7 +83,8 @@ extension PostgresError: DatabaseError {
     public var isConstraintFailure: Bool { self.code.isConstraintFailure }
 }
 
-extension PSQLError: DatabaseError {
+// Used for DatabaseError conformance
+extension PSQLError {
     public var isSyntaxError: Bool {
         switch self.code {
         case .server: return self.serverInfo?[.sqlState].map { PostgresError.Code(raw: $0).isSyntaxError } ?? false
@@ -104,3 +106,11 @@ extension PSQLError: DatabaseError {
         }
     }
 }
+
+#if compiler(<6)
+extension PostgresError: DatabaseError { }
+extension PSQLError: DatabaseError { }
+#else
+extension PostgresError: @retroactive DatabaseError { }
+extension PSQLError: @retroactive DatabaseError { }
+#endif

Sources/FluentPostgresDriver/PostgresError+Database.swift

@@ -274,7 +274,7 @@ final class FluentPostgresDriverTests: XCTestCase {
      }
 
     override func tearDown() async throws {
-        self.dbs.shutdown()
+        await self.dbs.shutdownAsync()
         try await super.tearDown()
     }
 }

Tests/FluentPostgresDriverTests/FluentPostgresDriverTests.swift

@@ -56,7 +56,7 @@ final class FluentPostgresTransactionControlTests: XCTestCase {
 
     override func tearDown() async throws {
         try await CreateTodo().revert(on: self.db)
-        self.dbs.shutdown()
+        await self.dbs.shutdownAsync()
         try await super.tearDown()
     }