Merge branch 'lightsprint09-feature/explicit-dependency-starscream' into development

* lightsprint09-feature/explicit-dependency-starscream:
  Go back to Starscream 2.1.1
  Fixes Mac build
  Proof of concept
  Remove StarScream

Author: nuclearace

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "Source/Starscream"]
-	path = Source/Starscream
-	url = https://github.com/nuclearace/Starscream
-	branch = socket.io-dev

.travis.yml

@@ -1,16 +1,17 @@
 language: objective-c
 xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
-xcode_scheme: SocketIO-iOS
+xcode_scheme: SocketIO-Mac
 osx_image: xcode9
 branches:
   only:
     - master
     - development
-    - swift4.0
 before_install:
   - brew update
   - brew outdated xctool || brew upgrade xctool
+  - brew outdated carthage || brew upgrade carthage
 script:
+  - carthage update
   - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -quiet
 #  - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build-for-testing -quiet
 #  - xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac run-tests --parallelize

Cartfile

@@ -0,0 +1 @@
+github "daltoniam/Starscream" ~> 2.0

Cartfile.resolved

@@ -0,0 +1 @@
+github "daltoniam/Starscream" "2.1.1"

Package.swift

@@ -8,9 +8,9 @@ let package = Package(
         .library(name: "SocketIO", targets: ["SocketIO"])
     ],
     dependencies: [
-        .package(url: "https://github.com/nuclearace/Starscream", .upToNextMajor(from: "9.0.0")),
+        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "2.1.1")),
     ],
     targets: [
-        .target(name: "SocketIO", dependencies: ["StarscreamSocketIO"], exclude: ["Sources/Starscream"])
+        .target(name: "SocketIO", dependencies: ["Starscream"])
     ]
 )

Socket.IO-Client-Swift.xcodeproj/project.pbxproj

@@ -11,7 +11,6 @@
 @import Foundation;
 @import XCTest;
 @import SocketIO;
-@import StarscreamSocketIO;
 
 @interface SocketObjectiveCTest : XCTestCase
 

SocketIO-MacTests/SocketObjectiveCTest.m

@@ -8,7 +8,6 @@
 
 import XCTest
 @testable import SocketIO
-@testable import StarscreamSocketIO
 
 class SocketSideEffectTest: XCTestCase {
     func testInitialCurrentAck() {

SocketIO-MacTests/SocketSideEffectTest.swift

@@ -23,7 +23,7 @@
 //  THE SOFTWARE.
 
 import Foundation
-import StarscreamSocketIO
+import Starscream
 
 protocol ClientOption : CustomStringConvertible, Equatable {
     func getSocketIOOptionValue() -> Any

Source/SocketIO/Client/SocketIOClientOption.swift

@@ -24,7 +24,7 @@
 
 import Dispatch
 import Foundation
-import StarscreamSocketIO
+import Starscream
 
 /// The class that handles the engine.io protocol and transports.
 /// See `SocketEnginePollable` and `SocketEngineWebsocket` for transport specific methods.
@@ -134,7 +134,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
     private var pongsMissedMax = 0
     private var probeWait = ProbeWaitQueue()
     private var secure = false
-    private var security: SSLSecurity?
+    private var security: SocketIO.SSLSecurity?
     private var selfSigned = false
 
     // MARK: Initializers
@@ -310,27 +310,27 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
 
     private func createWebSocketAndConnect() {
         ws?.delegate = nil // TODO this seems a bit defensive, is this really needed?
-        var request = URLRequest(url: urlWebSocketWithSid)
+        ws = WebSocket(url: urlWebSocketWithSid)
 
         if cookies != nil {
             let headers = HTTPCookie.requestHeaderFields(with: cookies!)
             for (key, value) in headers {
-                request.setValue(value, forHTTPHeaderField: key)
+                ws?.headers[key] = value
             }
         }
 
         if extraHeaders != nil {
             for (headerName, value) in extraHeaders! {
-                request.setValue(value, forHTTPHeaderField: headerName)
+                ws?.headers[headerName] = value
             }
         }
 
-        ws = WebSocket(request: request)
+        
         ws?.callbackQueue = engineQueue
         ws?.enableCompression = compress
         ws?.delegate = self
         ws?.disableSSLCertValidation = selfSigned
-        ws?.security = security
+        ws?.security = security?.security
 
         ws?.connect()
     }
@@ -605,7 +605,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
     // MARK: Starscream delegate conformance
 
     /// Delegate method for connection.
-    public func websocketDidConnect(socket: WebSocketClient) {
+    public func websocketDidConnect(socket: WebSocket) {
         if !forceWebsockets {
             probing = true
             probeWebSocket()
@@ -617,7 +617,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
     }
 
     /// Delegate method for disconnection.
-    public func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
+    public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
         probing = false
 
         if closed {