Swift 5.8 (#50)

* Swift 5.8 * Remove #if compiler(>=5.5.2)
hummingbird-project · Apr 3, 2023 · 6bea362 · 6bea362
1 parent c1e57c4
commit 6bea362
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 26 deletions.
diff --git a/.github/workflows/api-breakage.yml b/.github/workflows/api-breakage.yml
@@ -8,7 +8,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
@@ -39,9 +39,9 @@ jobs:
     strategy:
       matrix:
         image:
-          - 'swift:5.5'
           - 'swift:5.6'
           - 'swift:5.7'
+          - 'swift:5.8'
 
     container:
       image: ${{ matrix.image }}

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.6
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Sources/HummingbirdCore/AsyncAwaitSupport/RequestBodyStreamer+async.swift b/Sources/HummingbirdCore/AsyncAwaitSupport/RequestBodyStreamer+async.swift
@@ -12,8 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
-
 import NIOCore
 
 @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
@@ -72,5 +70,3 @@ public struct HBRequestBodyStreamerSequence: AsyncSequence {
         return AsyncIterator(streamer: self.streamer)
     }
 }
-
-#endif // compiler(>=5.5) && canImport(_Concurrency)
diff --git a/Sources/HummingbirdCore/Request/ByteBufferStreamer.swift b/Sources/HummingbirdCore/Request/ByteBufferStreamer.swift
@@ -33,12 +33,8 @@ public protocol HBStreamerProtocol: HBSendable {
     /// - Returns: EventLoopFuture that will be fulfilled when all buffers are consumed
     func consumeAll(on eventLoop: EventLoop, _ process: @escaping (ByteBuffer) -> EventLoopFuture<Void>) -> EventLoopFuture<Void>
 
-    #if compiler(>=5.5.2) && canImport(_Concurrency)
-
     @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
     func consume() async throws -> HBStreamerOutput
-
-    #endif // compiler(>=5.5) && canImport(_Concurrency)
 }
 
 /// Request body streamer. `HBHTTPDecodeHandler` feeds this with ByteBuffers while the Router consumes them
@@ -338,7 +334,5 @@ final class HBStaticStreamer: HBStreamerProtocol {
     }
 }
 
-#if compiler(>=5.6)
 extension HBByteBufferStreamer: @unchecked Sendable {}
 extension HBStaticStreamer: @unchecked Sendable {}
-#endif
diff --git a/Sources/HummingbirdCore/Request/RequestBody.swift b/Sources/HummingbirdCore/Request/RequestBody.swift
@@ -96,8 +96,6 @@ extension HBRequestBody: CustomStringConvertible {
     }
 }
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
-
 @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
 extension HBRequestBody {
     /// Provide body as a single ByteBuffer
@@ -118,5 +116,3 @@ extension HBRequestBody {
         }
     }
 }
-
-#endif // compiler(>=5.5.2) && canImport(_Concurrency)
diff --git a/Sources/HummingbirdCore/Response/ResponseBody.swift b/Sources/HummingbirdCore/Response/ResponseBody.swift
@@ -14,12 +14,8 @@
 
 import NIOCore
 
-#if compiler(>=5.6)
 /// Function returning streamed byte buffer output
 public typealias HBStreamCallback = @Sendable (EventLoop) -> EventLoopFuture<HBStreamerOutput>
-#else
-public typealias HBStreamCallback = (EventLoop) -> EventLoopFuture<HBStreamerOutput>
-#endif
 
 /// Response body. Can be a single ByteBuffer, a stream of ByteBuffers or empty
 public enum HBResponseBody: HBSendable {

diff --git a/Tests/HummingbirdCoreTests/CoreTests+async.swift b/Tests/HummingbirdCoreTests/CoreTests+async.swift
@@ -12,8 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
-
 import HummingbirdCore
 import HummingbirdCoreXCT
 import NIOCore
@@ -85,5 +83,3 @@ final class HummingBirdCoreAsyncTests: XCTestCase {
         XCTAssertNoThrow(try future.wait())
     }
 }
-
-#endif // compiler(>=5.5) && canImport(_Concurrency)
diff --git a/Tests/HummingbirdCoreTests/CoreTests.swift b/Tests/HummingbirdCoreTests/CoreTests.swift
@@ -172,7 +172,6 @@ class HummingBirdCoreTests: XCTestCase {
     func testConsumeBodyInTask() {
         struct Responder: HBHTTPResponder {
             func respond(to request: HBHTTPRequest, context: ChannelHandlerContext, onComplete: @escaping (Result<HBHTTPResponse, Error>) -> Void) {
-                let eventLoop = context.eventLoop
                 Task {
                     do {
                         let buffer = try await request.body.consumeBody(maxSize: .max)