Update swift-tools-version and fix tests

Author: Benedikt Hruschka

Package.swift

@@ -1,12 +1,13 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.3
 import PackageDescription
 
 let package = Package(
     name: "Networking",
     platforms: [
         .iOS(.v11),
         .tvOS(.v11),
-        .watchOS(.v5)
+        .watchOS(.v5),
+        .macOS(.v10_12)
     ],
     products: [
         .library(name: "Networking", targets: ["Networking"])
@@ -16,7 +17,16 @@ let package = Package(
         .package(url: "https://github.com/cellular/cellular-swift", from: "6.0.1"),
     ],
     targets: [
-        .target(name: "Networking", dependencies: ["CELLULAR", "Alamofire"]),
-        .testTarget(name: "NetworkingTests", dependencies: ["Networking"])
+        .target(
+            name: "Networking",
+            dependencies: ["Alamofire", .product(name: "CELLULAR", package: "cellular-swift")]
+        ),
+        .testTarget(
+            name: "NetworkingTests",
+            dependencies: ["Networking"],
+            resources: [
+                .process("Resources"),
+            ]
+        )
     ]
 )

Sources/Networking/Core/Definitions/Error.swift

@@ -4,7 +4,7 @@ import Foundation
 ///
 /// - unsolvedDependency: Indicates an error due to an unsolved dependency update.
 /// - malformedUrl: Indicates an error due to an invalid request URL.
-/// - invalidCredentials: Indiciates an error due to invalid credentials (within authorization).
+/// - invalidCredentials: Indicates an error due to invalid credentials (within authorization).
 /// - requestFailed: Indicates an error due to failed request (e.g. timeout) - request available.
 /// - serializationFailed: Indicates an error due to an invalid deserialization.
 /// - clientError: Indicates a client error on the request (4xx) - response available.
@@ -59,7 +59,7 @@ extension Error: CustomDebugStringConvertible, CustomStringConvertible {
             return "[Networking Error] Could not form a valid request URL.\nDescription: \(error)"
         case let .invalidCredentials(error):
             return "[Networking Error] Authorization failed.\nDescription: \(error)"
-        case let .requestFailed(error):
+        case let .requestFailed(error, _):
             return "[Networking Error] Request failed.\nDescription: \(error)"
         case let .serializationFailed(error):
             return "[Networking Error] Serialization failed.\nDescription: \(error)"

Tests/NetworkingTests/Local/LocalFileResponseTests.swift

@@ -16,8 +16,7 @@ class LocalFileRequestTestCase: XCTestCase {
      */
     override func setUp() {
         super.setUp()
-        let bundle = Bundle(for: LocalFileRequestTestCase.self)
-        let definition = LocalFileDefinition(bundle: bundle, fileName: "LocalFileDefinition", placeholders: ["%@$1" : "bar"])
+        let definition = LocalFileDefinition(bundle: Bundle.module, fileName: "LocalFileDefinition", placeholders: ["%@$1" : "bar"])
         do {
             client = try Client(provider: LocalFileProvider(definition: definition))
         } catch let error {
@@ -35,7 +34,7 @@ class LocalFileResponseTests: LocalFileRequestTestCase {
 
         let provider = LocalFileProvider(mapping: [
             LocalFileMap(url: "https://foo.de/bar", fileName: "bar")
-        ], bundle: Bundle(for: type(of: self)))
+        ], bundle: Bundle.module)
         client = Client(provider: provider)
         client?.performDependencyUpdateRoutine(())
 
@@ -52,7 +51,7 @@ class LocalFileResponseTests: LocalFileRequestTestCase {
 
         let provider = LocalFileProvider(mapping: [
             LocalFileMap(url: "https://foo.de/bar", fileName: "foo")
-            ], bundle: Bundle(for: type(of: self)))
+            ], bundle: Bundle.module)
         client = Client(provider: provider)
         client?.performDependencyUpdateRoutine(())
 
@@ -120,8 +119,7 @@ class LocalFileResponseTests: LocalFileRequestTestCase {
     }
 
     func testThrowOfErrorWithInvalidJSON() {
-        let bundle = Bundle(for: LocalFileRequestTestCase.self)
-        let definition = LocalFileDefinition(bundle: bundle, fileName: "BrokenLocalFileDefinition", placeholders: [String: String]())
+        let definition = LocalFileDefinition(bundle: Bundle.module, fileName: "BrokenLocalFileDefinition", placeholders: [String: String]())
         var parsingError: Swift.Error?
         do {
             client = try Client(provider: LocalFileProvider(definition: definition))
@@ -133,7 +131,5 @@ class LocalFileResponseTests: LocalFileRequestTestCase {
             case let DecodingError.keyNotFound(key, _) = decodingError {
             XCTAssert(key.stringValue == "statusCode", "Missing CodingKey should be \"statusCode\"")
         }
-
-
     }
 }

Tests/NetworkingTests/Remote/ResponseTests.swift

@@ -81,7 +81,7 @@ class ResponseDataTests: BaseRequestTestCase {
         // Given
         let expectation = self.expectation(description: "Request should succeed")
         var result: (dependency: HTTPBin, request: Request, response: Response)?
-        let fileURL = Bundle(for: type(of: self)).url(forResource: "a", withExtension: "png")!
+        let fileURL = Bundle.module.url(forResource: "a", withExtension: "png")!
 
         // When
         let promise = client.upload(.fileURL(fileURL), path: { $0.post })
@@ -97,7 +97,7 @@ class ResponseDataTests: BaseRequestTestCase {
         // Given
         let expectation = self.expectation(description: "Request should succeed")
         var result: (dependency: HTTPBin, request: Request, response: Response)?
-        let fileURL = Bundle(for: type(of: self)).url(forResource: "a", withExtension: "png")!
+        let fileURL = Bundle.module.url(forResource: "a", withExtension: "png")!
 
         // When
         let promise = client.upload(.fileURL(fileURL), path: { $0.put })
@@ -114,7 +114,7 @@ class ResponseDataTests: BaseRequestTestCase {
         let expectation = self.expectation(description: "Request should call progress handler")
         expectation.assertForOverFulfill = false // avoids crash when filfill
 
-        let fileURL = Bundle(for: type(of: self)).url(forResource: "b", withExtension: "png")!
+        let fileURL = Bundle.module.url(forResource: "b", withExtension: "png")!
 
         // When
         let promise = client.upload(.fileURL(fileURL), path: { $0.post }, progressHandler: { _ in
@@ -131,7 +131,7 @@ class ResponseDataTests: BaseRequestTestCase {
         // Given
         let expectation = self.expectation(description: "Request should succeed")
         var result: (dependency: HTTPBin, request: Request, response: Response)?
-        let fileURL = Bundle(for: type(of: self)).url(forResource: "a", withExtension: "png")!
+        let fileURL = Bundle.module.url(forResource: "a", withExtension: "png")!
         let data = try! Data(contentsOf: fileURL)
         let inputStream = InputStream(data: data)
 
@@ -149,7 +149,7 @@ class ResponseDataTests: BaseRequestTestCase {
         // Given
         let expectation = self.expectation(description: "Request should succeed")
         var result: (dependency: HTTPBin, request: Request, response: Response)?
-        let fileURL = Bundle(for: type(of: self)).url(forResource: "a", withExtension: "png")!
+        let fileURL = Bundle.module.url(forResource: "a", withExtension: "png")!
         let data = try! Data(contentsOf: fileURL)
 
         // When