Merge fbcb880 into bd9d4ba

CocoaMQTTTests/CocoaMQTTTests.swift

@@ -8,6 +8,9 @@
 
 import XCTest
 @testable import CocoaMQTT
+#if IS_SWIFT_PACKAGE
+@testable import CocoaMQTTWebSocket
+#endif
 
 private let host = "localhost"
 private let port: UInt16 = 1883

Package.resolved

@@ -0,0 +1,34 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "CocoaAsyncSocket",
+        "repositoryURL": "https://github.com/robbiehanson/CocoaAsyncSocket",
+        "state": {
+          "branch": null,
+          "revision": "0e00c967a010fc43ce528bd633d032f17158d393",
+          "version": "7.6.4"
+        }
+      },
+      {
+        "package": "Starscream",
+        "repositoryURL": "https://github.com/daltoniam/Starscream.git",
+        "state": {
+          "branch": null,
+          "revision": "e6b65c6d9077ea48b4a7bdda8994a1d3c6969c8d",
+          "version": "3.1.1"
+        }
+      },
+      {
+        "package": "swift-nio-zlib-support",
+        "repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
+        "state": {
+          "branch": null,
+          "revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
+          "version": "1.0.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Package.swift

@@ -0,0 +1,37 @@
+// swift-tools-version:5.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "CocoaMQTT",
+    platforms: [
+        .macOS(.v10_12),
+        .iOS(.v10),
+        .tvOS(.v10)
+    ],
+    products: [
+        .library(name: "CocoaMQTT", targets: [ "CocoaMQTT" ]),
+        .library(name: "CocoaMQTTWebSocket", targets: [ "CocoaMQTTWebSocket" ])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/robbiehanson/CocoaAsyncSocket", from: "7.6.4"),
+        .package(url: "https://github.com/daltoniam/Starscream.git", from: "3.0.2"),
+    ],
+    targets: [
+        .target(name: "CocoaMQTT",
+                dependencies: [ "CocoaAsyncSocket" ],
+                path: "Source",
+                exclude: ["CocoaMQTTWebSocket.swift"],
+                swiftSettings: [ .define("IS_SWIFT_PACKAGE")]),
+        .target(name: "CocoaMQTTWebSocket",
+                dependencies: [ "CocoaMQTT", "Starscream" ],
+                path: "Source",
+                sources: ["CocoaMQTTWebSocket.swift"],
+                swiftSettings: [ .define("IS_SWIFT_PACKAGE")]),
+        .testTarget(name: "CocoaMQTTTests",
+                    dependencies: [ "CocoaMQTT", "CocoaMQTTWebSocket" ],
+                    path: "CocoaMQTTTests",
+                    swiftSettings: [ .define("IS_SWIFT_PACKAGE")])
+    ]
+)

Source/CocoaMQTTWebSocket.swift

@@ -7,6 +7,9 @@
 
 import Foundation
 import Starscream
+#if IS_SWIFT_PACKAGE
+import CocoaMQTT
+#endif
 
 // MARK: - Interfaces