Drop support for Nuimo web socket controllers

Nuimo.xcodeproj/project.pbxproj

@@ -18,7 +18,6 @@
 		46FB8EAD1C1B086600ED88DE /* NuimoGesture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46FB8EA31C1B086600ED88DE /* NuimoGesture.swift */; };
 		46FB8EAE1C1B086600ED88DE /* NuimoGestureEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46FB8EA41C1B086600ED88DE /* NuimoGestureEvent.swift */; };
 		46FB8EAF1C1B086600ED88DE /* NuimoLEDMatrix.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46FB8EA51C1B086600ED88DE /* NuimoLEDMatrix.swift */; };
-		46FB8EB01C1B086600ED88DE /* NuimoWebSocketController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46FB8EA71C1B086600ED88DE /* NuimoWebSocketController.swift */; };
 		4E70E7BE741DC57CFD83968D /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F56754F7BEEA5425C497D7F /* Pods.framework */; };
 /* End PBXBuildFile section */
 
@@ -48,7 +47,6 @@
 		46FB8EA31C1B086600ED88DE /* NuimoGesture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NuimoGesture.swift; sourceTree = "<group>"; };
 		46FB8EA41C1B086600ED88DE /* NuimoGestureEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NuimoGestureEvent.swift; sourceTree = "<group>"; };
 		46FB8EA51C1B086600ED88DE /* NuimoLEDMatrix.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NuimoLEDMatrix.swift; sourceTree = "<group>"; };
-		46FB8EA71C1B086600ED88DE /* NuimoWebSocketController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NuimoWebSocketController.swift; sourceTree = "<group>"; };
 		6F56754F7BEEA5425C497D7F /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8F8EEB89589377F962BD46B2 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -123,19 +121,10 @@
 				46FB8EA31C1B086600ED88DE /* NuimoGesture.swift */,
 				46FB8EA41C1B086600ED88DE /* NuimoGestureEvent.swift */,
 				46FB8EA51C1B086600ED88DE /* NuimoLEDMatrix.swift */,
-				46FB8EA61C1B086600ED88DE /* WebSocket */,
 			);
 			path = SDK;
 			sourceTree = "<group>";
 		};
-		46FB8EA61C1B086600ED88DE /* WebSocket */ = {
-			isa = PBXGroup;
-			children = (
-				46FB8EA71C1B086600ED88DE /* NuimoWebSocketController.swift */,
-			);
-			path = WebSocket;
-			sourceTree = "<group>";
-		};
 		8F99C384716A98A956BDE19D /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -305,7 +294,6 @@
 				46FB8EA91C1B086600ED88DE /* BLEDiscoveryManager.swift in Sources */,
 				46FB8EAE1C1B086600ED88DE /* NuimoGestureEvent.swift in Sources */,
 				46FB8EA81C1B086600ED88DE /* BLEDevice.swift in Sources */,
-				46FB8EB01C1B086600ED88DE /* NuimoWebSocketController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

NuimoSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "NuimoSwift"
-  s.version      = "0.3.2"
+  s.version      = "0.3.3"
   s.summary      = "Swift library for connecting and communicating with Senic's Nuimo controllers"
   s.description  = <<-DESC
                      Swift library for connecting and communicating with Senic's Nuimo controllers
@@ -17,21 +17,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.9"
 
-  s.source       = { :git => "https://github.com/getSenic/nuimo-swift.git", :tag => s.version }
+  s.source       = { :git => "https://github.com/getSenic/nuimo-swift.git", :tag => "v#{s.version}" }
   s.framework    = 'CoreBluetooth'
-  s.default_subspec = 'Core'
-
-  s.subspec 'Core' do |c|
-    # Default sub spec for users who don't need the WebSockets feature
-    c.source_files = "SDK/*.swift"
-  end
-
-  s.subspec 'WebSockets' do |ws|
-    ws.ios.deployment_target = "8.0"
-    ws.osx.deployment_target = "10.9"
-    ws.source_files = "SDK/WebSocket/*.swift"
-    ws.xcconfig = { 'OTHER_SWIFT_FLAGS' => '$(inherited) -DNUIMO_USE_WEBSOCKETS' }
-    ws.dependency 'NuimoSwift/Core'
-    ws.dependency "SwiftWebSocket"
-  end
+  s.source_files = "SDK/*.swift"
 end

Podfile

@@ -1,3 +1 @@
 use_frameworks!
-
-pod 'SwiftWebSocket'

SDK/NuimoDiscoveryManager.swift

@@ -11,7 +11,6 @@
 import CoreBluetooth
 
 public let NuimoDiscoveryManagerAutoDetectUnreachableControllersKey = "NuimoDiscoveryManagerAutoDetectUnreachableControllers"
-public let NuimoDiscoveryManagerWebSocketControllerURLsKey = "NuimoDiscoveryManagerWebSocketControllerURLs"
 public let NuimoDiscoveryManagerAdditionalDiscoverServiceUUIDsKey = "NuimoDiscoveryManagerAdditionalDiscoverServiceUUIDs"
 
 // Allows for discovering Nuimo BLE hardware controllers and virtual (websocket) controllers
@@ -32,13 +31,6 @@ public class NuimoDiscoveryManager: NSObject, BLEDiscoveryDelegate {
     }
 
     public func startDiscovery() {
-        // Discover websocket controllers
-        #if NUIMO_USE_WEBSOCKETS
-        (options[NuimoDiscoveryManagerWebSocketControllerURLsKey] as? [String])?.forEach {
-            delegate?.nuimoDiscoveryManager(self, didDiscoverNuimoController: NuimoWebSocketController(url: $0))
-        }
-        #endif
-
         let detectUnreachableControllers = options[NuimoDiscoveryManagerAutoDetectUnreachableControllersKey] as? Bool ?? false
         let additionalDiscoverServiceUUIDs = options[NuimoDiscoveryManagerAdditionalDiscoverServiceUUIDsKey] as? [CBUUID] ?? []
         bleDiscovery.startDiscovery(nuimoServiceUUIDs + additionalDiscoverServiceUUIDs, detectUnreachableControllers: detectUnreachableControllers)