🔀 Merge pull request #44 from MrSkwiggs/bleeding_edge

🐛 Fix Linux compilation issues

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Sources/Netswift/Core/HTTPPerformer.swift

@@ -7,6 +7,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 /// An HTTP Performer works with low-level URLRequests and validates the response's status code
 public protocol HTTPPerformer {

Sources/Netswift/Core/NetswiftError/NetswiftError.swift

@@ -120,7 +120,7 @@ private extension Data {
                 return "Invalid JSON\n\(plainString ?? plainDescription)"
             }
             return prettyString
-        } else if let plainString {
+        } else if let plainString = plainString {
             return plainString
         } else {
             return plainDescription

Sources/Netswift/Core/NetswiftHTTPResponse.swift

@@ -7,6 +7,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 /// Convenience wrapper for URLResponses
 public struct NetswiftHTTPResponse {

Sources/Netswift/Core/NetswiftHeaders.swift

@@ -61,8 +61,10 @@ public struct NetswiftHeaders {
         var all = additionalHeaders
         all.update(with: .accept(accept))
         all.update(with: .contentType(contentType))
-        if let authorization { all.update(with: .authorization(authorization)) }
-
+        if let authorization = authorization {
+            all.update(with: .authorization(authorization))
+        }
+
         return all
     }
 }

Sources/Netswift/Core/NetswiftNetworkPerformer.swift

@@ -7,6 +7,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 /**
  A `NetswiftNetworkPerformer` is the link between low-level url requests and high-level api requests

Sources/Netswift/Core/NetswiftRequest.swift

@@ -7,6 +7,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 /// Generic structure that defines its own Response type. Comes with a few convenience extensions for common types such as JSON
 public protocol NetswiftRequest {

Sources/Netswift/Core/NetswiftRoute.swift

@@ -8,6 +8,9 @@
 //  swiftlint:disable force_unwrapping
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 /**
  Protocol defining URL Routes for APIs.

Sources/Netswift/Core/NetswiftSession.swift

@@ -7,6 +7,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 /// Protocol that allows to mock URLSessions
 public protocol NetswiftSession {
@@ -31,14 +34,35 @@ extension URLSession: NetswiftSession {
         return task
     }
 
+    #if os(Linux)
     /// Asynchronous data call made via NetswiftSession Protocol
     @available(iOS 13.0, tvOS 13.0, watchOS 6.0, *)
     public func perform(_ urlRequest: URLRequest) async -> NetswiftHTTPResponse {
         do {
-            let (data, response) = try await data(for: urlRequest)
+            let response: (Data?, URLResponse?) = try await withCheckedThrowingContinuation { continuation in
+                dataTask(with: urlRequest) { data, response, error in
+                    if let error = error {
+                        continuation.resume(throwing: error)
+                    }
+                    continuation.resume(returning: (data, response))
+                }
+            }
+
+            return NetswiftHTTPResponse(data: response.0, response: response.1)
+        } catch {
+            return NetswiftHTTPResponse(data: nil, response: nil, error: error)
+        }
+    }
+    #else
+    /// Asynchronous data call made via NetswiftSession Protocol
+    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, *)
+    public func perform(_ urlRequest: URLRequest) async -> NetswiftHTTPResponse {
+        do {
+            let (data, response) = try await self.data(for: urlRequest)
             return NetswiftHTTPResponse(data: data, response: response)
         } catch {
             return NetswiftHTTPResponse(data: nil, response: nil, error: error)
         }
     }
+    #endif
 }

Sources/Netswift/Core/NetswiftTask.swift

@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 public protocol NetswiftTask {
 

Sources/Netswift/Core/URLRequestExtension.swift

@@ -7,6 +7,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 /// Convenience wrapper functions
 public extension URLRequest {

Sources/Netswift/NetswiftHTTPPerformer.swift

@@ -7,6 +7,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 /// A generic HTTP Performer. For detailed doc please refer to HTTPPerformer protocol
 open class NetswiftHTTPPerformer: HTTPPerformer {

Sources/Netswift/NetswiftPerformer.swift

@@ -7,6 +7,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 /// Generic NetswiftRequest performer. For detailed doc please refer to NetswiftNetworkPerformer protocol
 open class NetswiftPerformer: NetswiftNetworkPerformer {