swift 5.9 (#141)

swift-server-community · Oct 24, 2023 · deae8ea · deae8ea
1 parent acab374
commit deae8ea
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 12 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "name": "MQTT Swift 5.6",
+    "name": "MQTT Swift",
     "dockerComposeFile": "docker-compose.yml",
     "service": "app",
     "workspaceFolder": "/workspace",

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.3"
 
 services:
   app:
-    image: swift:5.8
+    image: swift:5.9
     volumes:
       - ..:/workspace
     depends_on:

diff --git a/.github/workflows/api-breakage.yml b/.github/workflows/api-breakage.yml
@@ -7,7 +7,7 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     container:
-      image: swift:5.8
+      image: swift:5.9
     steps:
     - name: Checkout
       uses: actions/checkout@v3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,9 +48,10 @@ jobs:
     strategy:
       matrix:
         tag:
-          - swift:5.6
           - swift:5.7
           - swift:5.8
+          - swift:5.9
+          - swiftlang/swift:nightly-5.10-jammy
     container:
       image: ${{ matrix.tag }}
     services:

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 
 import PackageDescription
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # MQTT NIO
 
 [![sswg:sandbox|94x20](https://img.shields.io/badge/sswg-sandbox-lightgrey.svg)](https://github.com/swift-server/sswg/blob/master/process/incubation.md#sandbox-level)
-[<img src="https://img.shields.io/badge/swift-5.6_to_5.8-brightgreen.svg" alt="Swift 5.8" />](https://swift.org)
+[<img src="https://img.shields.io/badge/swift-5.7-brightgreen.svg" alt="Swift 5.7" />](https://swift.org)
 [<img src="https://github.com/adam-fowler/mqtt-nio/workflows/CI/badge.svg" />](https://github.com/adam-fowler/mqtt-nio/workflows/CI/badge.svg)
 
 A Swift NIO based MQTT v3.1.1 and v5.0 client.

diff --git a/Sources/MQTTNIO/MQTTClient.swift b/Sources/MQTTNIO/MQTTClient.swift
@@ -82,11 +82,7 @@ public final class MQTTClient {
     /// flag to tell is client is shutdown
     private let isShutdown = ManagedAtomic(false)
 
-    #if swift(>=5.6)
     typealias ShutdownCallback = @Sendable (Error?) -> Void
-    #else
-    typealias ShutdownCallback = (Error?) -> Void
-    #endif
 
     /// Create MQTT client
     /// - Parameters:

diff --git a/Tests/MQTTNIOTests/MQTTNIOTests.swift b/Tests/MQTTNIOTests/MQTTNIOTests.swift
@@ -664,7 +664,7 @@ final class MQTTNIOTests: XCTestCase {
             XCTFail("Did not expect \(String(describing: requestEnd))")
         }
         _ = try channel.finish()
-        promise.succeed()
+        promise.succeed(())
     }
 
     // MARK: Helper variables and functions

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.3"
 
 services:
   test:
-    image: swift:5.5
+    image: swift:5.9
     working_dir: /mqtt-nio
     volumes:
       - .:/mqtt-nio