Fix Linux compatibility

Automattic · Nov 27, 2024 · 625914e · 625914e
1 parent 1b446f5
commit 625914e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/native/swift/Sources/wordpress-api/Protocols/CallbackAwarePerformer.swift b/native/swift/Sources/wordpress-api/Protocols/CallbackAwarePerformer.swift
@@ -108,13 +108,13 @@ extension CallbackAwarePerformer {
                     return
                 }
 
-                guard let httpResponse = response as? HTTPURLResponse, let data else {
+                guard let response, let data else {
                     completion(.failure(WordPressAPI.Errors.unableToParseResponse))
                     return
                 }
 
                 do {
-                    let rawResponse = try WpNetworkResponse.from(data: data, response: httpResponse)
+                    let rawResponse = try WpNetworkResponse.from(data: data, response: response)
                     let parsedResponse = try responseConverter(rawResponse)
                     completion(.success(parsedResponse))
                 } catch {
@@ -135,5 +135,4 @@ extension CallbackAwarePerformer where Self: NoDeletionParams {
             try parseDeleteResponse(response: $0)
         }, completion: callback)
     }
-
 }
diff --git a/native/swift/Sources/wordpress-api/Protocols/Conformances/Media.swift b/native/swift/Sources/wordpress-api/Protocols/Conformances/Media.swift
@@ -1,6 +1,9 @@
 import Foundation
 @preconcurrency import WordPressAPIInternal
-import Combine
+
+#if os(Linux)
+import FoundationNetworking
+#endif
 
 public final class MediaRequestPerformer {
     typealias ExecutorType = MediaRequestExecutor
@@ -19,9 +22,12 @@ public final class MediaRequestPerformer {
 public struct MediaCreateParams {}
 public struct MediaRequestCreateResponse {}
 
-extension MediaRequestPerformer: PublisherAwarePerformer {}
 extension MediaRequestPerformer: CallbackAwarePerformer {}
 
+#if canImport(Combine)
+extension MediaRequestPerformer: PublisherAwarePerformer {}
+#endif
+
 extension MediaRequestPerformer: RequestPerformer {
     public func buildListWithEditRequest(params: MediaListParams) -> WpNetworkRequest {
         builder.listWithEditContext(params: params)

diff --git a/native/swift/Sources/wordpress-api/Protocols/Conformances/PostType.swift b/native/swift/Sources/wordpress-api/Protocols/Conformances/PostType.swift
@@ -4,6 +4,10 @@ import Foundation
 @preconcurrency import WordPressAPIInternal
 #endif
 
+#if os(Linux)
+import FoundationNetworking
+#endif
+
 public final class PostTypeRequestPerformer {
     typealias ExecutorType = PostTypesRequestExecutor
     typealias RequestBuilderType = PostTypesRequestBuilder

diff --git a/native/swift/Sources/wordpress-api/Protocols/Conformances/Posts.swift b/native/swift/Sources/wordpress-api/Protocols/Conformances/Posts.swift
@@ -4,6 +4,10 @@ import Foundation
 @preconcurrency import WordPressAPIInternal
 #endif
 
+#if os(Linux)
+import FoundationNetworking
+#endif
+
 public final class PostsRequestPerformer {
     typealias ExecutorType = PostsRequestExecutor
     typealias RequestBuilderType = PostsRequestBuilder
@@ -98,7 +102,6 @@ extension PostsRequestPerformer: PaginationAwarePerformer {}
 extension PostsRequestPerformer: SequenceAwarePerformer {}
 
 #if canImport(Combine)
-import Combine
 extension PostsRequestPerformer: PublisherAwarePerformer {}
 #endif
 

diff --git a/native/swift/Sources/wordpress-api/Protocols/Conformances/Users.swift b/native/swift/Sources/wordpress-api/Protocols/Conformances/Users.swift
@@ -4,6 +4,10 @@ import Foundation
 @preconcurrency import WordPressAPIInternal
 #endif
 
+#if os(Linux)
+import FoundationNetworking
+#endif
+
 public final class UsersRequestPerformer {
     typealias ExecutorType = UsersRequestExecutor
     typealias RequestBuilderType = UsersRequestBuilder
@@ -24,7 +28,6 @@ extension UsersRequestPerformer: PaginationAwarePerformer {}
 extension UsersRequestPerformer: SequenceAwarePerformer {}
 
 #if canImport(Combine)
-import Combine
 extension UsersRequestPerformer: PublisherAwarePerformer {}
 #endif
 

diff --git a/native/swift/Sources/wordpress-api/Protocols/RequestPerformer.swift b/native/swift/Sources/wordpress-api/Protocols/RequestPerformer.swift
@@ -1,5 +1,9 @@
 import Foundation
 
+#if os(Linux)
+import FoundationNetworking
+#endif
+
 public protocol RequestPerformer: Sendable {
     associatedtype IdType