use swift 6 in CI (#35)

aaronsky · Sep 21, 2024 · f0bc00d · f0bc00d
1 parent bcdad6b
commit f0bc00d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tag: ['5.9', '5.10']
+        tag: ['5.9', '6.0']
     container:
       image: swift:${{ matrix.tag }}-focal
     steps:

diff --git a/.github/workflows/swiftpm.yml b/.github/workflows/swiftpm.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: macos-14
     strategy:
       matrix:
-        xcode: ['15.4', '16.1_beta']
+        xcode: ['15.4', '16.0']
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
     steps:
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tag: ['5.9', '5.10']
+        tag: ['5.9', '6.0']
     container:
       image: swift:${{ matrix.tag }}-focal
     steps:

diff --git a/Sources/AppStoreConnect/Networking/Transport.swift b/Sources/AppStoreConnect/Networking/Transport.swift
@@ -48,7 +48,7 @@ extension URLSession: Transport {
     public func send(request: URLRequest, decoder: JSONDecoder) async throws -> Response<Data> {
         // These depend on swift-corelibs-foundation, which have not implemented the
         // Task-based API for URLSession.
-        #if os(Linux) || os(Windows)
+        #if (os(Linux) || os(Windows)) && swift(<6.0)
             return try await withCheckedThrowingContinuation { continuation in
                 send(request: request, decoder: decoder, completion: continuation.resume)
             }
@@ -120,7 +120,7 @@ extension URLSession: Transport {
     public func download(request: URLRequest) async throws -> Response<URL> {
         // These depend on swift-corelibs-foundation, which have not implemented the
         // Task-based API for URLSession.
-        #if os(Linux) || os(Windows)
+        #if (os(Linux) || os(Windows)) && swift(<6.0)
             return try await withCheckedThrowingContinuation { continuation in
                 download(request: request, completion: continuation.resume)
             }
@@ -191,7 +191,7 @@ extension URLSession: Transport {
     public func upload(request: URLRequest, data: Data, decoder: JSONDecoder) async throws -> Response<Data> {
         // These depend on swift-corelibs-foundation, which have not implemented the
         // Task-based API for URLSession.
-        #if os(Linux) || os(Windows)
+        #if (os(Linux) || os(Windows)) && swift(<6.0)
             return try await withCheckedThrowingContinuation { continuation in
                 upload(request: request, data: data, decoder: decoder, completion: continuation.resume)
             }

diff --git a/Tests/AppStoreConnectTests/FormattersTests.swift b/Tests/AppStoreConnectTests/FormattersTests.swift
@@ -18,25 +18,25 @@ final class FormattersTests: XCTestCase {
             // yyyy-MM-dd'T'HH:mm:ssXXXXX
             XCTAssertNotNil(iso8601Formatter.date(from: "2022-11-19T12:00:01Z"))
         }
-    #endif
 
-    func testFormattersCodable() throws {
-        struct Foo: Codable, Equatable {
-            var date: Date
-        }
+        func testFormattersCodable() throws {
+            struct Foo: Codable, Equatable {
+                var date: Date
+            }
 
-        let expected = Foo(date: Date(timeIntervalSince1970: 1584216283.567))
+            let expected = Foo(date: Date(timeIntervalSince1970: 1584216283.567))
 
-        let encoder = JSONEncoder()
-        encoder.dateEncodingStrategy = .custom(encodeISO8601Date(_:encoder:))
-        let data = try encoder.encode(expected)
+            let encoder = JSONEncoder()
+            encoder.dateEncodingStrategy = .custom(encodeISO8601Date(_:encoder:))
+            let data = try encoder.encode(expected)
 
-        let decoder = JSONDecoder()
-        decoder.dateDecodingStrategy = .custom(decodeISO8601Date(with:))
-        let actual = try decoder.decode(Foo.self, from: data)
+            let decoder = JSONDecoder()
+            decoder.dateDecodingStrategy = .custom(decodeISO8601Date(with:))
+            let actual = try decoder.decode(Foo.self, from: data)
 
-        XCTAssertEqual(expected, actual)
-    }
+            XCTAssertEqual(expected, actual)
+        }
+    #endif
 
     func testFormattersCodableError() throws {
         struct Foo: Codable, Equatable {