Skip to content

Commit c1422fd

Browse files
authored
Adopt Async APIs (#226)
* Drop support for 5.8 * Bump dependencies * Adopt new Asnyc APIs * Update CI
1 parent 93e7254 commit c1422fd

File tree

5 files changed

+14
-57
lines changed

5 files changed

+14
-57
lines changed

.github/workflows/test.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ jobs:
5050
- percona:8.0
5151
runner:
5252
# List is deliberately incomplete; we want to avoid running 50 jobs on every commit
53-
- swift:5.8-focal
53+
- swift:5.9-focal
5454
- swift:5.10-jammy
55-
- swiftlang/swift:nightly-6.0-jammy
55+
- swift:6.0-jammy
5656
container: ${{ matrix.runner }}
5757
runs-on: ubuntu-latest
5858
services:
@@ -86,8 +86,6 @@ jobs:
8686
fail-fast: false
8787
matrix:
8888
include:
89-
- macos-version: macos-13
90-
xcode-version: '~14.3'
9189
- macos-version: macos-14
9290
xcode-version: latest
9391
runs-on: ${{ matrix.macos-version }}

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: "FluentMySQLDriver", targets: ["FluentMySQLDriver"]),
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/mysql-kit.git", from: "4.9.0"),
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
] }

[email protected]

-48
This file was deleted.

Sources/FluentMySQLDriver/FluentMySQLDriver.swift

+4
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,8 @@ struct FluentMySQLDriver: DatabaseDriver {
3333
func shutdown() {
3434
try? self.pool.syncShutdownGracefully()
3535
}
36+
37+
func shutdownAsync() async {
38+
try? await self.pool.shutdownAsync()
39+
}
3640
}

Tests/FluentMySQLDriverTests/FluentMySQLDriverTests.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,10 @@ final class FluentMySQLDriverTests: XCTestCase {
492492
), as: .b)
493493
}
494494

495-
override func tearDownWithError() throws {
496-
self.dbs.shutdown()
495+
override func tearDown() async throws {
496+
await self.dbs.shutdownAsync()
497497

498-
try super.tearDownWithError()
498+
try await super.tearDown()
499499
}
500500
}
501501

0 commit comments

Comments
 (0)