Merge branch 'main' of github.com:OperatorFoundation/Transport into main

OperatorFoundation · Oct 5, 2020 · e9fdb30 · e9fdb30
2 parents cc17b1e + 9013238
commit e9fdb30
Show file tree

Hide file tree

Showing 9 changed files with 318 additions and 254 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,6 +1,15 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "Socket",
+        "repositoryURL": "https://github.com/OperatorFoundation/BlueSocket",
+        "state": {
+          "branch": null,
+          "revision": "90212ea8b66787c2d51d03527a04748ba6ee7679",
+          "version": "1.1.0"
+        }
+      },
       {
         "package": "Datable",
         "repositoryURL": "https://github.com/OperatorFoundation/Datable.git",
@@ -9,6 +18,15 @@
           "revision": "1c23f2b72d0d0cf4386fad05f8a5db4b91e8d304",
           "version": "3.0.2"
         }
+      },
+      {
+        "package": "NetworkLinux",
+        "repositoryURL": "https://github.com/OperatorFoundation/NetworkLinux.git",
+        "state": {
+          "branch": null,
+          "revision": "70d849482b2da95781cf72df3457e5cee7b3d3ad",
+          "version": "0.0.6"
+        }
       }
     ]
   },

diff --git a/Package.swift b/Package.swift
@@ -14,12 +14,13 @@ let package = Package(
             targets: ["Transport"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/OperatorFoundation/Datable.git", from: "3.0.2")
+        .package(url: "https://github.com/OperatorFoundation/Datable.git", from: "3.0.2"),
+        .package(url: "https://github.com/OperatorFoundation/NetworkLinux.git", from: "0.0.7"),
     ],
     targets: [
         .target(
             name: "Transport",
-            dependencies: []),
+            dependencies: ["NetworkLinux"]),
         .testTarget(
             name: "TransportTests",
             dependencies: ["Transport", "Datable"]),

diff --git a/Sources/Transport/Connection.swift b/Sources/Transport/Connection.swift
@@ -1,5 +1,10 @@
 import Foundation
-import Network
+
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+    import Network
+#elseif os(Linux)
+    import NetworkLinux
+#endif
 
 public protocol Connection
 {

diff --git a/Sources/Transport/ConnectionFactory.swift b/Sources/Transport/ConnectionFactory.swift
@@ -6,7 +6,11 @@
 //
 
 import Foundation
-import Network
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+    import Network
+#elseif os(Linux)
+    import NetworkLinux
+#endif
 
 public protocol ConnectionFactory {
 

diff --git a/Sources/Transport/Listener.swift b/Sources/Transport/Listener.swift
@@ -6,7 +6,11 @@
 //
 
 import Foundation
-import Network
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+    import Network
+#elseif os(Linux)
+    import NetworkLinux
+#endif
 
 public protocol Listener
 {

diff --git a/Sources/Transport/NWConnection+Connection.swift b/Sources/Transport/NWConnection+Connection.swift
@@ -6,7 +6,11 @@
 //
 
 import Foundation
-import Network
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+    import Network
+#elseif os(Linux)
+    import NetworkLinux
+#endif
 
 extension NWConnection: Connection
 {

diff --git a/Sources/Transport/NWListener+Listener.swift b/Sources/Transport/NWListener+Listener.swift
@@ -6,7 +6,11 @@
 //
 
 import Foundation
-import Network
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+    import Network
+#elseif os(Linux)
+    import NetworkLinux
+#endif
 
 extension NWListener: Listener
 {

diff --git a/Sources/Transport/NetworkConnectionFactory.swift b/Sources/Transport/NetworkConnectionFactory.swift
@@ -6,7 +6,11 @@
 //
 
 import Foundation
-import Network
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+    import Network
+#elseif os(Linux)
+    import NetworkLinux
+#endif
 
 public class NetworkConnectionFactory: ConnectionFactory
 {