Skip to content

Commit deae8ea

Browse files
authored
swift 5.9 (#141)
1 parent acab374 commit deae8ea

File tree

9 files changed

+9
-12
lines changed

9 files changed

+9
-12
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "MQTT Swift 5.6",
2+
"name": "MQTT Swift",
33
"dockerComposeFile": "docker-compose.yml",
44
"service": "app",
55
"workspaceFolder": "/workspace",

.devcontainer/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.3"
33

44
services:
55
app:
6-
image: swift:5.8
6+
image: swift:5.9
77
volumes:
88
- ..:/workspace
99
depends_on:

.github/workflows/api-breakage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
linux:
88
runs-on: ubuntu-latest
99
container:
10-
image: swift:5.8
10+
image: swift:5.9
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v3

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ jobs:
4848
strategy:
4949
matrix:
5050
tag:
51-
- swift:5.6
5251
- swift:5.7
5352
- swift:5.8
53+
- swift:5.9
54+
- swiftlang/swift:nightly-5.10-jammy
5455
container:
5556
image: ${{ matrix.tag }}
5657
services:

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.6
1+
// swift-tools-version:5.7
22

33
import PackageDescription
44

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# MQTT NIO
22

33
[![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)
4-
[<img src="https://img.shields.io/badge/swift-5.6_to_5.8-brightgreen.svg" alt="Swift 5.8" />](https://swift.org)
4+
[<img src="https://img.shields.io/badge/swift-5.7-brightgreen.svg" alt="Swift 5.7" />](https://swift.org)
55
[<img src="https://github.com/adam-fowler/mqtt-nio/workflows/CI/badge.svg" />](https://github.com/adam-fowler/mqtt-nio/workflows/CI/badge.svg)
66

77
A Swift NIO based MQTT v3.1.1 and v5.0 client.

Sources/MQTTNIO/MQTTClient.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ public final class MQTTClient {
8282
/// flag to tell is client is shutdown
8383
private let isShutdown = ManagedAtomic(false)
8484

85-
#if swift(>=5.6)
8685
typealias ShutdownCallback = @Sendable (Error?) -> Void
87-
#else
88-
typealias ShutdownCallback = (Error?) -> Void
89-
#endif
9086

9187
/// Create MQTT client
9288
/// - Parameters:

Tests/MQTTNIOTests/MQTTNIOTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ final class MQTTNIOTests: XCTestCase {
664664
XCTFail("Did not expect \(String(describing: requestEnd))")
665665
}
666666
_ = try channel.finish()
667-
promise.succeed()
667+
promise.succeed(())
668668
}
669669

670670
// MARK: Helper variables and functions

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.3"
33

44
services:
55
test:
6-
image: swift:5.5
6+
image: swift:5.9
77
working_dir: /mqtt-nio
88
volumes:
99
- .:/mqtt-nio

0 commit comments

Comments
 (0)