Swift 5.8 (#135)

adam-fowler · web-flow · commit 8c872a5eb0d7 · 2023-04-16T09:43:56.000+01:00
* Update devcontainer

* Update workflows

* Remove 5.4/5.5 Package.swift

* Replace _MQTTSendable with Sendable
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,10 +3,29 @@
     "dockerComposeFile": "docker-compose.yml",
     "service": "app",
     "workspaceFolder": "/workspace",
-    "extensions": [
-      "sswg.swift-lang"
-    ],
-    "settings": {
-      "lldb.library": "/usr/lib/liblldb.so"
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "installZsh": "false",
+            "username": "vscode",
+            "userUid": "1000",
+            "userGid": "1000",
+            "upgradePackages": "false"
+        },
+        "ghcr.io/devcontainers/features/git:1": {
+            "version": "os-provided",
+            "ppa": "false"
+        }
+    },
+    // Configure tool-specific properties.
+    "customizations": {
+        // Configure properties specific to VS Code.
+        "vscode": {
+            "extensions": [
+              "sswg.swift-lang"
+            ],
+            "settings": {
+              "lldb.library": "/usr/lib/liblldb.so"
+            }
+        }
     }
 }
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.3"
 
 services:
   app:
-    image: swift:5.6-focal
+    image: swift:5.8
     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.7
+      image: swift:5.8
     steps:
     - name: Checkout
       uses: actions/checkout@v3
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,10 +48,9 @@ jobs:
     strategy:
       matrix:
         tag:
-          - swift:5.4
-          - swift:5.5
           - swift:5.6
           - swift:5.7
+          - swift:5.8
     container:
       image: ${{ matrix.tag }}
     services:
diff --git a/Package@swift-5.4.swift b/Package@swift-5.4.swift
diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift
diff --git a/Sources/MQTTNIO/AsyncAwaitSupport/MQTTClient+async.swift b/Sources/MQTTNIO/AsyncAwaitSupport/MQTTClient+async.swift
@@ -11,8 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5) && canImport(_Concurrency)
-
 import Foundation
 import NIOCore
 
@@ -161,5 +159,3 @@ public class MQTTPublishListener: AsyncSequence {
         return self.stream.makeAsyncIterator()
     }
 }
-
-#endif // compiler(>=5.5)
diff --git a/Sources/MQTTNIO/AsyncAwaitSupport/MQTTClientV5+async.swift b/Sources/MQTTNIO/AsyncAwaitSupport/MQTTClientV5+async.swift
@@ -11,8 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5) && canImport(_Concurrency)
-
 import Foundation
 import NIOCore
 
@@ -147,5 +145,3 @@ public class MQTTPublishIdListener: AsyncSequence {
         return self.stream.makeAsyncIterator()
     }
 }
-
-#endif // compiler(>=5.5)
diff --git a/Sources/MQTTNIO/AsyncAwaitSupport/Sendable.swift b/Sources/MQTTNIO/AsyncAwaitSupport/Sendable.swift
@@ -11,8 +11,5 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.6)
+@available(*, deprecated, renamed: "Sendable")
 public typealias _MQTTSendable = Sendable
-#else
-public typealias _MQTTSendable = Any
-#endif
diff --git a/Sources/MQTTNIO/MQTTClient.swift b/Sources/MQTTNIO/MQTTClient.swift
@@ -759,8 +759,6 @@ extension Logger {
     }
 }
 
-#if compiler(>=5.6)
 // All public members of the class are immutable and the class manages access to the
 // internal mutable state via Locks
 extension MQTTClient: @unchecked Sendable {}
-#endif
diff --git a/Sources/MQTTNIO/MQTTCoreTypes.swift b/Sources/MQTTNIO/MQTTCoreTypes.swift
@@ -14,7 +14,7 @@
 import NIOCore
 
 /// Indicates the level of assurance for delivery of a packet.
-public enum MQTTQoS: UInt8, _MQTTSendable {
+public enum MQTTQoS: UInt8, Sendable {
     /// fire and forget
     case atMostOnce = 0
     /// wait for PUBACK, if you don't receive it after a period of time retry sending
@@ -24,7 +24,7 @@ public enum MQTTQoS: UInt8, _MQTTSendable {
 }
 
 /// MQTT Packet type enumeration
-public enum MQTTPacketType: UInt8, _MQTTSendable {
+public enum MQTTPacketType: UInt8, Sendable {
     case CONNECT = 0x10
     case CONNACK = 0x20
     case PUBLISH = 0x30
@@ -43,7 +43,7 @@ public enum MQTTPacketType: UInt8, _MQTTSendable {
 }
 
 /// MQTT PUBLISH packet parameters.
-public struct MQTTPublishInfo: _MQTTSendable {
+public struct MQTTPublishInfo: Sendable {
     /// Quality of Service for message.
     public let qos: MQTTQoS
 
@@ -75,7 +75,7 @@ public struct MQTTPublishInfo: _MQTTSendable {
 }
 
 /// MQTT SUBSCRIBE packet parameters.
-public struct MQTTSubscribeInfo: _MQTTSendable {
+public struct MQTTSubscribeInfo: Sendable {
     /// Topic filter to subscribe to.
     public let topicFilter: String
 
@@ -91,8 +91,8 @@ public struct MQTTSubscribeInfo: _MQTTSendable {
 /// MQTT Sub ACK
 ///
 /// Contains data returned in subscribe ack packets
-public struct MQTTSuback: _MQTTSendable {
-    public enum ReturnCode: UInt8, _MQTTSendable {
+public struct MQTTSuback: Sendable {
+    public enum ReturnCode: UInt8, Sendable {
         case grantedQoS0 = 0
         case grantedQoS1 = 1
         case grantedQoS2 = 2
diff --git a/Sources/MQTTNIO/MQTTCoreTypesV5.swift b/Sources/MQTTNIO/MQTTCoreTypesV5.swift
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 /// MQTT v5 Connack
-public struct MQTTConnackV5: _MQTTSendable {
+public struct MQTTConnackV5: Sendable {
     /// is using session state from previous session
     public let sessionPresent: Bool
     /// connect reason code
@@ -22,7 +22,7 @@ public struct MQTTConnackV5: _MQTTSendable {
 }
 
 /// MQTT v5 ACK information. Returned with PUBACK, PUBREL
-public struct MQTTAckV5: _MQTTSendable {
+public struct MQTTAckV5: Sendable {
     /// MQTT v5 reason code
     public let reason: MQTTReasonCode
     /// MQTT v5 properties
@@ -35,9 +35,9 @@ public struct MQTTAckV5: _MQTTSendable {
 }
 
 /// MQTT v5 SUBSCRIBE packet parameters.
-public struct MQTTSubscribeInfoV5: _MQTTSendable {
+public struct MQTTSubscribeInfoV5: Sendable {
     /// Retain handling options
-    public enum RetainHandling: UInt8, _MQTTSendable {
+    public enum RetainHandling: UInt8, Sendable {
         /// always send retain message
         case sendAlways = 0
         /// send retain if new
@@ -79,7 +79,7 @@ public struct MQTTSubscribeInfoV5: _MQTTSendable {
 /// MQTT v5 Sub ACK packet
 ///
 /// Contains data returned in subscribe/unsubscribe ack packets
-public struct MQTTSubackV5: _MQTTSendable {
+public struct MQTTSubackV5: Sendable {
     /// MQTT v5 subscription reason code
     public let reasons: [MQTTReasonCode]
     /// MQTT v5 properties
@@ -96,7 +96,7 @@ public struct MQTTSubackV5: _MQTTSendable {
 /// An AUTH packet is sent from Client to Server or Server to Client as
 /// part of an extended authentication exchange, such as challenge / response
 /// authentication
-public struct MQTTAuthV5: _MQTTSendable {
+public struct MQTTAuthV5: Sendable {
     /// MQTT v5 authentication reason code
     public let reason: MQTTReasonCode
     /// MQTT v5 properties
diff --git a/Sources/MQTTNIO/MQTTError.swift b/Sources/MQTTNIO/MQTTError.swift
@@ -14,7 +14,7 @@
 /// MQTTClient errors
 public enum MQTTError: Error {
     /// Value returned in connection error
-    public enum ConnectionReturnValue: UInt8, _MQTTSendable {
+    public enum ConnectionReturnValue: UInt8, Sendable {
         /// connection was accepted
         case accepted = 0
         /// The Server does not support the version of the MQTT protocol requested by the Client.
diff --git a/Sources/MQTTNIO/MQTTPacket.swift b/Sources/MQTTNIO/MQTTPacket.swift
@@ -19,7 +19,7 @@ internal enum InternalError: Swift.Error {
 }
 
 /// Protocol for all MQTT packet types
-protocol MQTTPacket: CustomStringConvertible, _MQTTSendable {
+protocol MQTTPacket: CustomStringConvertible, Sendable {
     /// packet type
     var type: MQTTPacketType { get }
     /// packet id (default to zero if not used)
diff --git a/Sources/MQTTNIO/MQTTProperties.swift b/Sources/MQTTNIO/MQTTProperties.swift
@@ -14,9 +14,9 @@
 import NIOCore
 
 /// MQTT v5.0 properties. A property consists of a identifier and a value
-public struct MQTTProperties: _MQTTSendable {
+public struct MQTTProperties: Sendable {
     /// MQTT Property
-    public enum Property: Equatable, _MQTTSendable {
+    public enum Property: Equatable, Sendable {
         /// Payload format: 0 = bytes, 1 = UTF8 string (available for PUBLISH)
         case payloadFormat(UInt8)
         /// Message expiry indicates the lifetime of the message (available for PUBLISH)
diff --git a/Sources/MQTTNIO/MQTTReason.swift b/Sources/MQTTNIO/MQTTReason.swift
@@ -17,7 +17,7 @@
 /// Reason codes less than 128 are considered successful. Codes greater than or equal to 128 are considered
 /// a failure. These are returned by CONNACK, PUBACK, PUBREC, PUBREL, PUBCOMP, DISCONNECT and
 /// AUTH packets
-public enum MQTTReasonCode: UInt8, _MQTTSendable {
+public enum MQTTReasonCode: UInt8, Sendable {
     /// Success (available for all). For SUBACK mean QoS0 is available
     case success = 0
     /// The subscription is accepted and the maximum QoS sent will be QoS 1. This might be a lower QoS than was requested.
diff --git a/Tests/MQTTNIOTests/MQTTNIOTests+async.swift b/Tests/MQTTNIOTests/MQTTNIOTests+async.swift
@@ -11,8 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5) && canImport(_Concurrency)
-
 import Atomics
 import Logging
 import NIO
@@ -224,5 +222,3 @@ final class AsyncMQTTNIOTests: XCTestCase {
         try await client2.disconnect()
     }
 }
-
-#endif // compiler(>=5.5)

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`	`//`
`12`	`12`	`//===----------------------------------------------------------------------===//`
`13`	`13`
`14`		`-#if compiler(>=5.5) && canImport(_Concurrency)`
`15`		`-`
`16`	`14`	`import Foundation`
`17`	`15`	`import NIOCore`
`18`	`16`
`@@ -161,5 +159,3 @@ public class MQTTPublishListener: AsyncSequence {`
`161`	`159`	`return self.stream.makeAsyncIterator()`
`162`	`160`	`}`
`163`	`161`	`}`
`164`		`-`
`165`		`-#endif // compiler(>=5.5)`
Original file line number	Diff line number	Diff line change
`@@ -759,8 +759,6 @@ extension Logger {`
`759`	`759`	`}`
`760`	`760`	`}`
`761`	`761`
`762`		`-#if compiler(>=5.6)`
`763`	`762`	`// All public members of the class are immutable and the class manages access to the`
`764`	`763`	`// internal mutable state via Locks`
`765`	`764`	`extension MQTTClient: @unchecked Sendable {}`
`766`		`-#endif`