Skip to content

Commit 6e3a5ff

Browse files
authored
Adopt Async APIs (#98)
* Bump dependencies and drop 5.8 * Adopt new APIs * Fix Swift 6 warning
1 parent 9cc162d commit 6e3a5ff

File tree

5 files changed

+21
-55
lines changed

5 files changed

+21
-55
lines changed

Package.swift

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.8
1+
// swift-tools-version:5.9
22
import PackageDescription
33

44
let package = Package(
@@ -13,7 +13,7 @@ let package = Package(
1313
.library(name: "FluentSQLiteDriver", targets: ["FluentSQLiteDriver"]),
1414
],
1515
dependencies: [
16-
.package(url: "https://github.com/vapor/fluent-kit.git", from: "1.48.4"),
16+
.package(url: "https://github.com/vapor/fluent-kit.git", from: "1.49.0"),
1717
.package(url: "https://github.com/vapor/sqlite-kit.git", from: "4.5.1"),
1818
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
1919
],
@@ -40,6 +40,9 @@ let package = Package(
4040
)
4141

4242
var swiftSettings: [SwiftSetting] { [
43+
.enableUpcomingFeature("ExistentialAny"),
4344
.enableUpcomingFeature("ConciseMagicFile"),
4445
.enableUpcomingFeature("ForwardTrailingClosures"),
46+
.enableUpcomingFeature("DisableOutwardActorInference"),
47+
.enableExperimentalFeature("StrictConcurrency=complete"),
4548
] }

Package@swift-5.9.swift

-48
This file was deleted.

Sources/FluentSQLiteDriver/FluentSQLiteDriver.swift

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ struct FluentSQLiteDriver: DatabaseDriver {
2929
func shutdown() {
3030
try? self.pool.syncShutdownGracefully()
3131
}
32+
33+
func shutdownAsync() async {
34+
try? await self.pool.shutdownAsync()
35+
}
3236
}
3337

3438
struct ConnectionPoolSQLiteDatabase: SQLiteDatabase {

Sources/FluentSQLiteDriver/SQLiteError+Database.swift

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import SQLiteNIO
22
import FluentKit
33

4-
extension SQLiteError: DatabaseError {
4+
// Required for Database Error
5+
extension SQLiteError {
56
public var isSyntaxError: Bool {
67
switch self.reason {
78
case .error, .schema:
@@ -32,3 +33,9 @@ extension SQLiteError: DatabaseError {
3233
}
3334
}
3435
}
36+
37+
#if compiler(<6)
38+
extension SQLiteError: DatabaseError { }
39+
#else
40+
extension SQLiteError: @retroactive DatabaseError { }
41+
#endif

Tests/FluentSQLiteDriverTests/FluentSQLiteDriverTests.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,11 @@ final class FluentSQLiteDriverTests: XCTestCase {
218218
self.dbs.use(.sqlite(.file(self.benchmarkPath)), as: .init(string: "benchmark"))
219219
self.database = self.dbs.database(.sqlite, logger: .init(label: "test.fluent.sqlite"), on: MultiThreadedEventLoopGroup.singleton.any())
220220
}
221-
222-
override func tearDownWithError() throws {
223-
self.dbs.shutdown()
221+
222+
override func tearDown() async throws {
223+
await self.dbs.shutdownAsync()
224224
self.dbs = nil
225-
try super.tearDownWithError()
225+
try await super.tearDown()
226226
}
227227
}
228228

0 commit comments

Comments
 (0)