Merge pull request #233 from lvalenta/master

Fix compilation in Linux environment
AvdLee · May 24, 2023 · f2c1d8f · f2c1d8f
2 parents df11b1c + e1bf8fb
commit f2c1d8f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,6 +1,21 @@
 // swift-tools-version:5.6
 import PackageDescription
 
+var dependencies: [Package.Dependency] = [
+    .package(url: "https://github.com/CreateAPI/URLQueryEncoder.git", from: "0.2.0"),
+    .package(url: "https://github.com/apple/swift-crypto.git", from: "2.5.0")
+]
+
+var targetDependencies: [Target.Dependency] = [
+    .productItem(name: "URLQueryEncoder", package: "URLQueryEncoder"),
+    .productItem(name: "Crypto", package: "swift-crypto")
+]
+
+#if os(Linux)
+dependencies.append(.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.14.0"))
+targetDependencies.append(.product(name: "OpenCombine", package: "OpenCombine"))
+#endif
+
 let package = Package(
     name: "AppStoreConnect-Swift-SDK",
     platforms: [
@@ -11,18 +26,12 @@ let package = Package(
     products: [
         .library(name: "AppStoreConnect-Swift-SDK", targets: ["AppStoreConnect-Swift-SDK"])
     ],
-    dependencies: [
-        .package(url: "https://github.com/CreateAPI/URLQueryEncoder.git", from: "0.2.0"),
-        .package(url: "https://github.com/apple/swift-crypto.git", from: "2.3.0"),
-    ],
+    dependencies: dependencies,
     targets: [
         .testTarget(name: "AppStoreConnect-Swift-SDK-Tests", dependencies: ["AppStoreConnect-Swift-SDK"], path: "Tests"),
         .target(
             name: "AppStoreConnect-Swift-SDK",
-            dependencies: [
-                .productItem(name: "URLQueryEncoder", package: "URLQueryEncoder"),
-                .productItem(name: "Crypto", package: "swift-crypto")
-            ],
+            dependencies: targetDependencies,
             path: "Sources",
             exclude: ["OpenAPI/app_store_connect_api_2.3_openapi.json"]
         ),

diff --git a/Sources/APIProvider.swift b/Sources/APIProvider.swift
@@ -6,8 +6,11 @@
 //
 
 import Foundation
+#if os(Linux)
+import OpenCombine
+#else
 import Combine
-import Crypto
+#endif
 #if canImport(FoundationNetworking)
 import FoundationNetworking
 #endif

diff --git a/Sources/Extensions/HTTPURLResponseExtensions.swift b/Sources/Extensions/HTTPURLResponseExtensions.swift
@@ -6,6 +6,9 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 extension HTTPURLResponse {
     var rateLimit: RateLimit? {