Merge pull request #1 from swift-serverless/feature/swift-6

Feature/swift 6

Author: Andrea-Scuderi

.github/workflows/swift-test.yml

@@ -14,7 +14,7 @@ env:
 jobs:
   swift-tests:
     name: 'Swift Tests'
-    runs-on: macos-13
+    runs-on: macos-15
     defaults:
       run:
         shell: bash

Package.swift

@@ -1,12 +1,12 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "BreezeLambdaAPIClient",
     platforms: [
-        .macOS(.v13),
+        .macOS(.v15),
         .iOS(.v15)
     ],
     products: [

Sources/BreezeLambdaAPIClient/APIClientEnv.swift

@@ -14,19 +14,30 @@
 
 import Foundation
 
-public struct APIClientEnv {
+public struct APIClientEnv: Sendable {
 
     public let session: URLSession
 
     public let baseURL: URL
 
-    public var cachePolicy: NSURLRequest.CachePolicy = .useProtocolCachePolicy
-    public var logger: APIClientLogging?
-    public var decoder: JSONDecoder = JSONDecoder()
-    public var encoder: JSONEncoder = JSONEncoder()
+    public let cachePolicy: NSURLRequest.CachePolicy
+    public let logger: APIClientLogging?
+    public let decoder: JSONDecoder
+    public let encoder: JSONEncoder
 
-    public init(session: URLSession, baseURL: String) throws {
+    public init(
+        session: URLSession,
+        baseURL: String,
+        cachePolicy: NSURLRequest.CachePolicy = .useProtocolCachePolicy,
+        logger: APIClientLogging? = nil,
+        decoder: JSONDecoder = JSONDecoder(),
+        encoder: JSONEncoder = JSONEncoder()
+    ) throws {
         self.session = session
+        self.logger = logger
+        self.decoder = decoder
+        self.encoder = encoder
+        self.cachePolicy = cachePolicy
         guard let url = URL(string: baseURL) else {
             throw APIClientError.invalidURL
         }

Sources/BreezeLambdaAPIClient/APIClientLogging.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 
-public protocol APIClientLogging {
+public protocol APIClientLogging: Sendable {
     func log(request: URLRequest)
     func log(data: Data, for response: URLResponse)
 }

Sources/BreezeLambdaAPIClient/BreezeLambdaAPIClient.swift

@@ -22,7 +22,7 @@ private struct Items<Item: KeyedCodable>: Codable {
     let items: [Item]
 }
 
-public struct BreezeLambdaAPIClient<Item: KeyedCodable> {
+public struct BreezeLambdaAPIClient<Item: KeyedCodable>: Sendable {
 
     let env: APIClientEnv
     let path: String

Tests/BreezeLambdaAPIClientTests/APIEndpointTests.swift

@@ -12,50 +12,52 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 
-import XCTest
+import Testing
+import Foundation
 @testable import BreezeLambdaAPIClient
 
-final class APIEndpointTests: XCTestCase {
+@Suite
+struct APIEndpointTests {
 
-    var environment: APIClientEnv!
-    var sut: APIEndpoint!
+    let environment: APIClientEnv
     let baseURL: String = "https://apitest123.execute-api.us-east-1.amazonaws.com"
 
-    override func setUpWithError() throws {
+    init() throws {
         let session = URLSession(configuration: .ephemeral)
         environment = try APIClientEnv(session: session, baseURL: baseURL)
     }
 
-    override func tearDownWithError() throws {
-        environment = nil
+    @Test
+    func initSetPath() throws {
+        let sut = APIEndpoint(env: environment, path: "path", queryItems: [URLQueryItem(name: "name", value: "value")])
+        #expect(sut.path == "path")
     }
 
-    func testInit() throws {
-        sut = APIEndpoint(env: environment, path: "path", queryItems: [URLQueryItem(name: "name", value: "value")])
-        XCTAssertEqual(sut.path, "path")
-    }
-    
-    func testUrl_whenNoPathAndNoQueryItemes() throws {
-        sut = APIEndpoint(env: environment, path: "", queryItems: nil)
+    @Test
+    func url_whenNoPathAndNoQueryItemes() throws {
+        let sut = APIEndpoint(env: environment, path: "", queryItems: nil)
         let url = try sut.url()
-        XCTAssertEqual(url.absoluteString, "https://apitest123.execute-api.us-east-1.amazonaws.com")
+        #expect(url.absoluteString == "https://apitest123.execute-api.us-east-1.amazonaws.com")
     }
 
-    func testUrl_whenNoQueryItemes() throws {
-        sut = APIEndpoint(env: environment, path: "path", queryItems: nil)
+    @Test
+    func url_whenNoQueryItemes() throws {
+        let sut = APIEndpoint(env: environment, path: "path", queryItems: nil)
         let url = try sut.url()
-        XCTAssertEqual(url.absoluteString, "https://apitest123.execute-api.us-east-1.amazonaws.com/path")
+        #expect(url.absoluteString == "https://apitest123.execute-api.us-east-1.amazonaws.com/path")
     }
 
-    func testUrl_whenNoPathAndQueryItemes() throws {
-        sut = APIEndpoint(env: environment, path: "", queryItems: [URLQueryItem(name: "name", value: "value")])
+    @Test
+    func url_whenNoPathAndQueryItemes() throws {
+        let sut = APIEndpoint(env: environment, path: "", queryItems: [URLQueryItem(name: "name", value: "value")])
         let url = try sut.url()
-        XCTAssertEqual(url.absoluteString, "https://apitest123.execute-api.us-east-1.amazonaws.com?name=value")
+        #expect(url.absoluteString == "https://apitest123.execute-api.us-east-1.amazonaws.com?name=value")
     }
 
-    func testUrl_whenQueryItemes() throws {
-        sut = APIEndpoint(env: environment, path: "path", queryItems: [URLQueryItem(name: "name", value: "value")])
+    @Test
+    func url_whenQueryItemes() throws {
+        let sut = APIEndpoint(env: environment, path: "path", queryItems: [URLQueryItem(name: "name", value: "value")])
         let url = try sut.url()
-        XCTAssertEqual(url.absoluteString, "https://apitest123.execute-api.us-east-1.amazonaws.com/path?name=value")
+        #expect(url.absoluteString == "https://apitest123.execute-api.us-east-1.amazonaws.com/path?name=value")
     }
 }