bumped spec

Merge pull request #277 from nuclearace/master
Fix Swift package manager
2016-11-14 22:29:34 -06:00 · 2016-11-01 18:57:49 -05:00 · 2016-10-30 19:47:58 -04:00 · 2016-10-26 20:41:30 -05:00 · 2016-10-26 20:26:58 -05:00 · 2016-10-26 20:26:30 -05:00
26 changed files with 958 additions and 591 deletions
@@ -0,0 +1 @@
+3.0
@@ -2,6 +2,57 @@
 All notable changes to this project will be documented in this file.
 `Starscream` adheres to [Semantic Versioning](http://semver.org/).

+#### [2.0.2](https://github.com/daltoniam/Starscream/tree/2.0.2)
+
+Fix for the Swift Package Manager.
+
+Fixed: 
+[#277](https://github.com/daltoniam/Starscream/issues/277)
+
+#### [2.0.1](https://github.com/daltoniam/Starscream/tree/2.0.1)
+
+Bug fixes.
+
+Fixed: 
+[#261](https://github.com/daltoniam/Starscream/issues/261)
+[#276](https://github.com/daltoniam/Starscream/issues/276)
+[#267](https://github.com/daltoniam/Starscream/issues/267)
+[#266](https://github.com/daltoniam/Starscream/issues/266)
+[#259](https://github.com/daltoniam/Starscream/issues/259)
+
+#### [2.0.0](https://github.com/daltoniam/Starscream/tree/2.0.0)
+
+Added Swift 3 support.
+
+Fixed: 
+[#229](https://github.com/daltoniam/Starscream/issues/229)
+[#232](https://github.com/daltoniam/Starscream/issues/232)
+
+#### [1.1.4](https://github.com/daltoniam/Starscream/tree/1.1.4)
+
+Swift 2.3 support.
+
+#### [1.1.3](https://github.com/daltoniam/Starscream/tree/1.1.3)
+
+Changed: 
+[#170](https://github.com/daltoniam/Starscream/issues/170)
+[#171](https://github.com/daltoniam/Starscream/issues/171)
+[#174](https://github.com/daltoniam/Starscream/issues/174)
+[#177](https://github.com/daltoniam/Starscream/issues/177)
+[#178](https://github.com/daltoniam/Starscream/issues/178)
+
+#### [1.1.2](https://github.com/daltoniam/Starscream/tree/1.1.2)
+
+Fixed: 
+[#158](https://github.com/daltoniam/Starscream/issues/158)
+[#161](https://github.com/daltoniam/Starscream/issues/161)
+[#164](https://github.com/daltoniam/Starscream/issues/164)
+
+#### [1.1.1](https://github.com/daltoniam/Starscream/tree/1.1.1)
+
+Fixed: 
+[#157](https://github.com/daltoniam/Starscream/issues/157)
+
 #### [1.1.0](https://github.com/daltoniam/Starscream/tree/1.1.0)

 Changed:
@@ -26,4 +77,4 @@ Fixes for #121, #123

 #### [1.0.0](https://github.com/daltoniam/Starscream/tree/1.0.0)

-first release of Swift 2 support.
+first release of Swift 2 support.
@@ -2,7 +2,7 @@
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

-   Copyright (c) 2014-2015 Dalton Cherry.
+   Copyright (c) 2014-2016 Dalton Cherry.

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

@@ -3,7 +3,7 @@
 //  Starscream
 //
 //  Created by Dalton Cherry on 5/16/15.
-//  Copyright (c) 2014-2015 Dalton Cherry.
+//  Copyright (c) 2014-2016 Dalton Cherry.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -22,4 +22,4 @@ import PackageDescription

 let package = Package(
    name: "Starscream"
-)
+)
@@ -4,16 +4,17 @@ Starscream is a conforming WebSocket ([RFC 6455](http://tools.ietf.org/html/rfc6

 It's Objective-C counter part can be found here: [Jetfire](https://github.com/acmacalister/jetfire)

-This is written Swift 2. (the latest). If you need older legecy support checkout the Swift-1.2 branch [here](https://github.com/daltoniam/Starscream/tree/swift-1.2).
-
 ## Features

 - Conforms to all of the base [Autobahn test suite](http://autobahn.ws/testsuite/).
 - Nonblocking. Everything happens in the background, thanks to GCD.
- Simple delegate pattern design.
 - TLS/WSS support.
 - Simple concise codebase at just a few hundred LOC.

+## Swift 2.3
+
+See release/tag 1.1.4 for Swift 2.3 support.
+
 ## Example

 First thing is to import the framework. See the Installation instructions on how to add the framework to your project.
@@ -22,10 +23,10 @@ First thing is to import the framework. See the Installation instructions on how
 import Starscream
 ```

-Once imported, you can open a connection to your WebSocket server. Note that `socket` is probably best as a property, so your delegate can stick around.
+Once imported, you can open a connection to your WebSocket server. Note that `socket` is probably best as a property, so it doesn't get deallocated right after being setup.

 ```swift
-var socket = WebSocket(url: NSURL(string: "ws://localhost:8080/")!)
+socket = WebSocket(url: URL(string: "ws://localhost:8080/")!)
 socket.delegate = self
 socket.connect()
 ```
@@ -38,7 +39,7 @@ websocketDidConnect is called as soon as the client connects to the server.

 ```swift
 func websocketDidConnect(socket: WebSocket) {
-    println("websocket is connected")
+    print("websocket is connected")
 }
 ```

@@ -48,7 +49,7 @@ websocketDidDisconnect is called as soon as the client is disconnected from the

 ```swift
 func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
-	println("websocket is disconnected: \(error?.localizedDescription)")
+	print("websocket is disconnected: \(error?.localizedDescription)")
 }
 ```

@@ -58,7 +59,7 @@ websocketDidReceiveMessage is called when the client gets a text frame from the

 ```swift
 func websocketDidReceiveMessage(socket: WebSocket, text: String) {
-	println("got some text: \(text)")
+	print("got some text: \(text)")
 }
 ```

@@ -67,8 +68,8 @@ func websocketDidReceiveMessage(socket: WebSocket, text: String) {
 websocketDidReceiveData is called when the client gets a binary frame from the connection.

 ```swift
-func websocketDidReceiveData(socket: WebSocket, data: NSData) {
-	println("got some data: \(data.length)")
+func websocketDidReceiveData(socket: WebSocket, data: Data) {
+	print("got some data: \(data.count)")
 }
 ```

@@ -77,60 +78,62 @@ func websocketDidReceiveData(socket: WebSocket, data: NSData) {
 websocketDidReceivePong is called when the client gets a pong response from the connection. You need to implement the WebSocketPongDelegate protocol and set an additional delegate, eg: ` socket.pongDelegate = self`

 ```swift
-func websocketDidReceivePong(socket: WebSocket) {
-	println("Got pong!")
+func websocketDidReceivePong(socket: WebSocket, data: Data?) {
+	print("Got pong! Maybe some data: \(data?.count)")
 }
 ```

 Or you can use closures.

 ```swift
-var socket = WebSocket(url: NSURL(string: "ws://localhost:8080/")!)
+socket = WebSocket(url: URL(string: "ws://localhost:8080/")!)
 //websocketDidConnect
 socket.onConnect = {
-    println("websocket is connected")
+    print("websocket is connected")
 }
 //websocketDidDisconnect
 socket.onDisconnect = { (error: NSError?) in
-    println("websocket is disconnected: \(error?.localizedDescription)")
+    print("websocket is disconnected: \(error?.localizedDescription)")
 }
 //websocketDidReceiveMessage
 socket.onText = { (text: String) in
-    println("got some text: \(text)")
+    print("got some text: \(text)")
 }
 //websocketDidReceiveData
-socket.onData = { (data: NSData) in
-    println("got some data: \(data.length)")
+socket.onData = { (data: Data) in
+    print("got some data: \(data.count)")
 }
 //you could do onPong as well.
 socket.connect()
 ```

+One more: you can listen to socket connection and disconnection via notifications. Starscream posts `WebsocketDidConnectNotification` and `WebsocketDidDisconnectNotification`. You can find an `NSError` that caused the disconection by accessing `WebsocketDisconnectionErrorKeyName` on notification `userInfo`.
+

 ## The delegate methods give you a simple way to handle data from the server, but how do you send data?

-### writeData
+### write a binary frame

-The writeData method gives you a simple way to send `NSData` (binary) data to the server.
+The writeData method gives you a simple way to send `Data` (binary) data to the server.

 ```swift
-self.socket.writeData(data) //write some NSData over the socket!
+socket.write(data: data) //write some Data over the socket!
 ```

-### writeString
+### write a string frame

 The writeString method is the same as writeData, but sends text/string.

 ```swift
-self.socket.writeString("Hi Server!") //example on how to write text over the socket!
+socket.write(string: "Hi Server!") //example on how to write text over the socket!
 ```

-### writePing
+### write a ping frame

-The writePing method is the same as writeData, but sends a ping control frame.
+The writePing method is the same as write, but sends a ping control frame.

 ```swift
-self.socket.writePing(NSData()) //example on how to write a ping control frame over the socket!
+socket.write(ping: Data()) //example on how to write a ping control frame over the socket!
 ```

 ### disconnect
@@ -138,7 +141,7 @@ self.socket.writePing(NSData()) //example on how to write a ping control frame o
 The disconnect method does what you would expect and closes the socket.

 ```swift
-self.socket.disconnect()
+socket.disconnect()
 ```

 ### isConnected
@@ -146,7 +149,7 @@ self.socket.disconnect()
 Returns if the socket is connected or not.

 ```swift
-if self.socket.isConnected {
+if socket.isConnected {
  // do cool stuff.
 }
 ```
@@ -167,7 +170,7 @@ If you need to specify a protocol, simple add it to the init:

 ```swift
 //chat and superchat are the example protocols here
-var socket = WebSocket(url: NSURL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
+socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
 socket.delegate = self
 socket.connect()
 ```
@@ -177,13 +180,13 @@ socket.connect()
 There are a couple of other properties that modify the stream:

 ```swift
-var socket = WebSocket(url: NSURL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
+socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])

 //set this if you are planning on using the socket in a VOIP background setting (using the background VOIP service).
 socket.voipEnabled = true

 //set this you want to ignore SSL cert validation, so a self signed SSL certificate can be used.
-socket.selfSignedSSL = true
+socket.disableSSLCertValidation = true
 ```

 ### SSL Pinning
@@ -191,21 +194,21 @@ socket.selfSignedSSL = true
 SSL Pinning is also supported in Starscream. 

 ```swift
-var socket = WebSocket(url: NSURL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
+socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
 let data = ... //load your certificate from disk
 socket.security = SSLSecurity(certs: [SSLCert(data: data)], usePublicKeys: true)
 //socket.security = SSLSecurity() //uses the .cer files in your app's bundle
 ```
-You load either a `NSData` blob of your certificate or you can use a `SecKeyRef` if you have a public key you want to use. The `usePublicKeys` bool is whether to use the certificates for validation or the public keys. The public keys will be extracted from the certificates automatically if `usePublicKeys` is choosen.
+You load either a `Data` blob of your certificate or you can use a `SecKeyRef` if you have a public key you want to use. The `usePublicKeys` bool is whether to use the certificates for validation or the public keys. The public keys will be extracted from the certificates automatically if `usePublicKeys` is choosen.

 ### Custom Queue

-A custom queue can be specified when delegate methods are called. By default `dispatch_get_main_queue` is used, thus making all delegate methods calls run on the main thread. It is important to note that all WebSocket processing is done on a background thread, only the delegate method calls are changed when modifying the queue. The actual processing is always on a background thread and will not pause your app.
+A custom queue can be specified when delegate methods are called. By default `DispatchQueue.main` is used, thus making all delegate methods calls run on the main thread. It is important to note that all WebSocket processing is done on a background thread, only the delegate method calls are changed when modifying the queue. The actual processing is always on a background thread and will not pause your app.

 ```swift
-var socket = WebSocket(url: NSURL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
+socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
 //create a custom queue
-socket.queue = dispatch_queue_create("com.vluxe.starscream.myapp", nil)
+socket.callbackQueue = DispatchQueue(label: "com.vluxe.starscream.myapp")
 ```

 ## Example Project
@@ -214,21 +217,21 @@ Check out the SimpleTest project in the examples directory to see how to setup a

 ## Requirements

-Starscream works with iOS 7/OSX 10.9 or above. It is recommended to use iOS 8/10.10 or above for Cocoapods/framework support. To use Starscream with a project targeting iOS 7, you must include all Swift files directly in your project.
+Starscream works with iOS 7/OSX 10.9 or above. It is recommended to use iOS 8/10.10 or above for CocoaPods/framework support. To use Starscream with a project targeting iOS 7, you must include all Swift files directly in your project.

 ## Installation

-### Cocoapods
+### CocoaPods

 Check out [Get Started](http://cocoapods.org/) tab on [cocoapods.org](http://cocoapods.org/).

 To use Starscream in your project add the following 'Podfile' to your project

 	source 'https://github.com/CocoaPods/Specs.git'
-	platform :ios, '8.0'
+	platform :ios, '9.0'
 	use_frameworks!

-	pod 'Starscream', '~> 1.0.0'
+	pod 'Starscream', '~> 2.0.0'

 Then run:

@@ -250,7 +253,7 @@ $ brew install carthage
 To integrate Starscream into your Xcode project using Carthage, specify it in your `Cartfile`:

 ```
-github "daltoniam/Starscream" >= 1.0.0
+github "daltoniam/Starscream" >= 2.0.0
 ```

 ### Rogue
@@ -277,8 +280,9 @@ If you are running this in an OSX app or on a physical iOS device you will need

 ## TODOs

- [ ] WatchOS
- [ ] Add Unit Tests
+- [ ] WatchOS?
+- [ ] Linux Support?
+- [ ] Add Unit Tests - Local Swift websocket server

 ## License

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>2.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>2.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -4,7 +4,7 @@
 //  Starscream
 //
 //  Created by Dalton Cherry on 5/16/15.
-//  Copyright (c) 2014-2015 Dalton Cherry.
+//  Copyright (c) 2014-2016 Dalton Cherry.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -23,9 +23,13 @@
 import Foundation
 import Security

-public class SSLCert {
-    var certData: NSData?
-    var key: SecKeyRef?
+public protocol SSLTrustValidator {
+    func isValid(_ trust: SecTrust, domain: String?) -> Bool
+}
+
+open class SSLCert {
+    var certData: Data?
+    var key: SecKey?
    
    /**
    Designated init for certificates
@@ -34,7 +38,7 @@ public class SSLCert {
    
    - returns: a representation security object to be used with
    */
-    public init(data: NSData) {
+    public init(data: Data) {
        self.certData = data
    }
    
@@ -45,17 +49,17 @@ public class SSLCert {
    
    - returns: a representation security object to be used with
    */
-    public init(key: SecKeyRef) {
+    public init(key: SecKey) {
        self.key = key
    }
 }

-public class SSLSecurity {
+open class SSLSecurity : SSLTrustValidator {
    public var validatedDN = true //should the domain name be validated?
    
    var isReady = false //is the key processing done?
-    var certificates: [NSData]? //the certificates
-    var pubKeys: [SecKeyRef]? //the public keys
+    var certificates: [Data]? //the certificates
+    var pubKeys: [SecKey]? //the public keys
    var usePublicKeys = false //use public keys or certificate validation?
    
    /**
@@ -66,11 +70,12 @@ public class SSLSecurity {
    - returns: a representation security object to be used with
    */
    public convenience init(usePublicKeys: Bool = false) {
-        let paths = NSBundle.mainBundle().pathsForResourcesOfType("cer", inDirectory: ".")
+        let paths = Bundle.main.paths(forResourcesOfType: "cer", inDirectory: ".")
        
-        let certs = paths.reduce([SSLCert]()) { (var certs: [SSLCert], path: String) -> [SSLCert] in
+        let certs = paths.reduce([SSLCert]()) { (certs: [SSLCert], path: String) -> [SSLCert] in
+            var certs = certs
            if let data = NSData(contentsOfFile: path) {
-                certs.append(SSLCert(data: data))
+                certs.append(SSLCert(data: data as Data))
            }
            return certs
        }
@@ -81,7 +86,7 @@ public class SSLSecurity {
    /**
    Designated init
    
-    - parameter keys: is the certificates or public keys to use
+    - parameter certs: is the certificates or public keys to use
    - parameter usePublicKeys: is to specific if the publicKeys or certificates should be used for SSL pinning validation
    
    - returns: a representation security object to be used with
@@ -90,9 +95,10 @@ public class SSLSecurity {
        self.usePublicKeys = usePublicKeys
        
        if self.usePublicKeys {
-            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0)) {
-                let pubKeys = certs.reduce([SecKeyRef]()) { (var pubKeys: [SecKeyRef], cert: SSLCert) -> [SecKeyRef] in
-                    if let data = cert.certData where cert.key == nil {
+            DispatchQueue.global(qos: .default).async {
+                let pubKeys = certs.reduce([SecKey]()) { (pubKeys: [SecKey], cert: SSLCert) -> [SecKey] in
+                    var pubKeys = pubKeys
+                    if let data = cert.certData, cert.key == nil {
                        cert.key = self.extractPublicKey(data)
                    }
                    if let key = cert.key {
@@ -105,7 +111,8 @@ public class SSLSecurity {
                self.isReady = true
            }
        } else {
-            let certificates = certs.reduce([NSData]()) { (var certificates: [NSData], cert: SSLCert) -> [NSData] in
+            let certificates = certs.reduce([Data]()) { (certificates: [Data], cert: SSLCert) -> [Data] in
+                var certificates = certificates
                if let data = cert.certData {
                    certificates.append(data)
                }
@@ -124,26 +131,26 @@ public class SSLSecurity {
    
    - returns: if the key was successfully validated
    */
-    public func isValid(trust: SecTrustRef, domain: String?) -> Bool {
+    public func isValid(_ trust: SecTrust, domain: String?) -> Bool {
        
        var tries = 0
-        while(!self.isReady) {
+        while !self.isReady {
            usleep(1000)
            tries += 1
            if tries > 5 {
                return false //doesn't appear it is going to ever be ready...
            }
        }
-        var policy: SecPolicyRef
+        var policy: SecPolicy
        if self.validatedDN {
-            policy = SecPolicyCreateSSL(true, domain)
+            policy = SecPolicyCreateSSL(true, domain as NSString?)
        } else {
            policy = SecPolicyCreateBasicX509()
        }
        SecTrustSetPolicies(trust,policy)
        if self.usePublicKeys {
            if let keys = self.pubKeys {
-                let serverPubKeys = publicKeyChainForTrust(trust)
+                let serverPubKeys = publicKeyChain(trust)
                for serverKey in serverPubKeys as [AnyObject] {
                    for key in keys as [AnyObject] {
                        if serverKey.isEqual(key) {
@@ -153,21 +160,20 @@ public class SSLSecurity {
                }
            }
        } else if let certs = self.certificates {
-            let serverCerts = certificateChainForTrust(trust)
+            let serverCerts = certificateChain(trust)
            var collect = [SecCertificate]()
            for cert in certs {
-                collect.append(SecCertificateCreateWithData(nil,cert)!)
+                collect.append(SecCertificateCreateWithData(nil,cert as CFData)!)
            }
-            SecTrustSetAnchorCertificates(trust,collect)
-            var result: SecTrustResultType = 0
+            SecTrustSetAnchorCertificates(trust,collect as NSArray)
+            var result: SecTrustResultType = .unspecified
            SecTrustEvaluate(trust,&result)
-            let r = Int(result)
-            if r == kSecTrustResultUnspecified || r == kSecTrustResultProceed {
+            if result == .unspecified || result == .proceed {
                var trustedCount = 0
                for serverCert in serverCerts {
                    for cert in certs {
                        if cert == serverCert {
-                            trustedCount++
+                            trustedCount += 1
                            break
                        }
                    }
@@ -187,10 +193,10 @@ public class SSLSecurity {
    
    - returns: a public key
    */
-    func extractPublicKey(data: NSData) -> SecKeyRef? {
-        guard let cert = SecCertificateCreateWithData(nil, data) else { return nil }
+    func extractPublicKey(_ data: Data) -> SecKey? {
+        guard let cert = SecCertificateCreateWithData(nil, data as CFData) else { return nil }
        
-        return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509())
+        return extractPublicKey(cert, policy: SecPolicyCreateBasicX509())
    }
    
    /**
@@ -200,13 +206,12 @@ public class SSLSecurity {
    
    - returns: a public key
    */
-    func extractPublicKeyFromCert(cert: SecCertificate, policy: SecPolicy) -> SecKeyRef? {
+    func extractPublicKey(_ cert: SecCertificate, policy: SecPolicy) -> SecKey? {
        var possibleTrust: SecTrust?
        SecTrustCreateWithCertificates(cert, policy, &possibleTrust)
        
        guard let trust = possibleTrust else { return nil }
-        
-        var result: SecTrustResultType = 0
+        var result: SecTrustResultType = .unspecified
        SecTrustEvaluate(trust, &result)
        return SecTrustCopyPublicKey(trust)
    }
@@ -218,10 +223,11 @@ public class SSLSecurity {
    
    - returns: the certificate chain for the trust
    */
-    func certificateChainForTrust(trust: SecTrustRef) -> [NSData] {
-        let certificates = (0..<SecTrustGetCertificateCount(trust)).reduce([NSData]()) { (var certificates: [NSData], index: Int) -> [NSData] in
+    func certificateChain(_ trust: SecTrust) -> [Data] {
+        let certificates = (0..<SecTrustGetCertificateCount(trust)).reduce([Data]()) { (certificates: [Data], index: Int) -> [Data] in
+            var certificates = certificates
            let cert = SecTrustGetCertificateAtIndex(trust, index)
-            certificates.append(SecCertificateCopyData(cert!))
+            certificates.append(SecCertificateCopyData(cert!) as Data)
            return certificates
        }
        
@@ -235,11 +241,12 @@ public class SSLSecurity {
    
    - returns: the public keys from the certifcate chain for the trust
    */
-    func publicKeyChainForTrust(trust: SecTrustRef) -> [SecKeyRef] {
+    func publicKeyChain(_ trust: SecTrust) -> [SecKey] {
        let policy = SecPolicyCreateBasicX509()
-        let keys = (0..<SecTrustGetCertificateCount(trust)).reduce([SecKeyRef]()) { (var keys: [SecKeyRef], index: Int) -> [SecKeyRef] in
+        let keys = (0..<SecTrustGetCertificateCount(trust)).reduce([SecKey]()) { (keys: [SecKey], index: Int) -> [SecKey] in
+            var keys = keys
            let cert = SecTrustGetCertificateAtIndex(trust, index)
-            if let key = extractPublicKeyFromCert(cert!, policy: policy) {
+            if let key = extractPublicKey(cert!, policy: policy) {
                keys.append(key)
            }
            
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = "Starscream"
-  s.version      = "1.1.1"
+  s.version      = "2.0.2"
  s.summary      = "A conforming WebSocket RFC 6455 client library in Swift for iOS and OSX."
  s.homepage     = "https://github.com/daltoniam/Starscream"
  s.license      = 'Apache License, Version 2.0'
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
  s.source       = { :git => 'https://github.com/daltoniam/Starscream.git',  :tag => "#{s.version}"}
  s.social_media_url = 'http://twitter.com/daltoniam'
  s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.9'
+  s.osx.deployment_target = '10.10'
  s.tvos.deployment_target = '9.0'
  s.source_files = 'Source/*.swift'
  s.requires_arc = 'true'
@@ -17,10 +17,10 @@
 		5C1360081C473BEF00AA3A01 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1360011C473BEF00AA3A01 /* WebSocket.swift */; };
 		5C1360091C473BEF00AA3A01 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1360011C473BEF00AA3A01 /* WebSocket.swift */; };
 		5C13600A1C473BEF00AA3A01 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1360011C473BEF00AA3A01 /* WebSocket.swift */; };
-		5CADAB511BEBD068005DE2F0 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */; };
-		6B3E7A0319D48C2F006071F7 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */; };
+		742419BC1DC6BDBA003ACE43 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */; };
+		742419BD1DC6BDBA003ACE43 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */; };
+		742419BE1DC6BDBA003ACE43 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */; };
 		D9C3E36A19E48FF1009FC285 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9C3E35F19E48FF1009FC285 /* Starscream.framework */; };
-		D9C3E37819E4903F009FC285 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -42,18 +42,18 @@

 /* Begin PBXFileReference section */
 		091277971BD673A70003036D /* Starscream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Starscream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		091277A01BD673A70003036D /* StarscreamTvTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StarscreamTvTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		091277A01BD673A70003036D /* Starscream tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Starscream tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5C135FFF1C473BEF00AA3A01 /* SSLSecurity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SSLSecurity.swift; path = Source/SSLSecurity.swift; sourceTree = SOURCE_ROOT; };
 		5C1360001C473BEF00AA3A01 /* Starscream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Starscream.h; path = Source/Starscream.h; sourceTree = SOURCE_ROOT; };
 		5C1360011C473BEF00AA3A01 /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WebSocket.swift; path = Source/WebSocket.swift; sourceTree = SOURCE_ROOT; };
 		5C13600B1C473BFE00AA3A01 /* Info-tvOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-tvOS.plist"; path = "Source/Info-tvOS.plist"; sourceTree = SOURCE_ROOT; };
 		5C13600C1C473BFE00AA3A01 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Source/Info.plist; sourceTree = SOURCE_ROOT; };
 		6B3E79E619D48B7F006071F7 /* Starscream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Starscream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		6B3E79F119D48B7F006071F7 /* StarscreamTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StarscreamTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		6B3E79F119D48B7F006071F7 /* Starscream iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Starscream iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6B3E7A0019D48C2F006071F7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StarscreamTests.swift; sourceTree = "<group>"; };
+		742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StarscreamTests.swift; path = StarscreamTests/StarscreamTests.swift; sourceTree = "<group>"; };
 		D9C3E35F19E48FF1009FC285 /* Starscream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Starscream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		D9C3E36919E48FF1009FC285 /* StarscreamOSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StarscreamOSXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		D9C3E36919E48FF1009FC285 /* Starscream OSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Starscream OSXTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -117,11 +117,11 @@
 			isa = PBXGroup;
 			children = (
 				6B3E79E619D48B7F006071F7 /* Starscream.framework */,
-				6B3E79F119D48B7F006071F7 /* StarscreamTests.xctest */,
+				6B3E79F119D48B7F006071F7 /* Starscream iOSTests.xctest */,
 				D9C3E35F19E48FF1009FC285 /* Starscream.framework */,
-				D9C3E36919E48FF1009FC285 /* StarscreamOSXTests.xctest */,
+				D9C3E36919E48FF1009FC285 /* Starscream OSXTests.xctest */,
 				091277971BD673A70003036D /* Starscream.framework */,
-				091277A01BD673A70003036D /* StarscreamTvTests.xctest */,
+				091277A01BD673A70003036D /* Starscream tvOSTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -150,7 +150,7 @@
 			isa = PBXGroup;
 			children = (
 				6B3E7A0019D48C2F006071F7 /* Info.plist */,
-				6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */,
+				742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -185,9 +185,9 @@
 /* End PBXHeadersBuildPhase section */

 /* Begin PBXNativeTarget section */
-		091277961BD673A70003036D /* StarscreamTv */ = {
+		091277961BD673A70003036D /* Starscream tvOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 091277A81BD673A70003036D /* Build configuration list for PBXNativeTarget "StarscreamTv" */;
+			buildConfigurationList = 091277A81BD673A70003036D /* Build configuration list for PBXNativeTarget "Starscream tvOS" */;
 			buildPhases = (
 				091277921BD673A70003036D /* Sources */,
 				091277931BD673A70003036D /* Frameworks */,
@@ -198,14 +198,14 @@
 			);
 			dependencies = (
 			);
-			name = StarscreamTv;
+			name = "Starscream tvOS";
 			productName = StarscreamTv;
 			productReference = 091277971BD673A70003036D /* Starscream.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		0912779F1BD673A70003036D /* StarscreamTvTests */ = {
+		0912779F1BD673A70003036D /* Starscream tvOSTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 091277AB1BD673A70003036D /* Build configuration list for PBXNativeTarget "StarscreamTvTests" */;
+			buildConfigurationList = 091277AB1BD673A70003036D /* Build configuration list for PBXNativeTarget "Starscream tvOSTests" */;
 			buildPhases = (
 				0912779C1BD673A70003036D /* Sources */,
 				0912779D1BD673A70003036D /* Frameworks */,
@@ -216,14 +216,14 @@
 			dependencies = (
 				091277A31BD673A70003036D /* PBXTargetDependency */,
 			);
-			name = StarscreamTvTests;
+			name = "Starscream tvOSTests";
 			productName = StarscreamTvTests;
-			productReference = 091277A01BD673A70003036D /* StarscreamTvTests.xctest */;
+			productReference = 091277A01BD673A70003036D /* Starscream tvOSTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		6B3E79E519D48B7F006071F7 /* Starscream */ = {
+		6B3E79E519D48B7F006071F7 /* Starscream iOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 6B3E79F919D48B7F006071F7 /* Build configuration list for PBXNativeTarget "Starscream" */;
+			buildConfigurationList = 6B3E79F919D48B7F006071F7 /* Build configuration list for PBXNativeTarget "Starscream iOS" */;
 			buildPhases = (
 				6B3E79E119D48B7F006071F7 /* Sources */,
 				6B3E79E219D48B7F006071F7 /* Frameworks */,
@@ -234,14 +234,14 @@
 			);
 			dependencies = (
 			);
-			name = Starscream;
+			name = "Starscream iOS";
 			productName = Starscream;
 			productReference = 6B3E79E619D48B7F006071F7 /* Starscream.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		6B3E79F019D48B7F006071F7 /* StarscreamTests */ = {
+		6B3E79F019D48B7F006071F7 /* Starscream iOSTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 6B3E79FC19D48B7F006071F7 /* Build configuration list for PBXNativeTarget "StarscreamTests" */;
+			buildConfigurationList = 6B3E79FC19D48B7F006071F7 /* Build configuration list for PBXNativeTarget "Starscream iOSTests" */;
 			buildPhases = (
 				6B3E79ED19D48B7F006071F7 /* Sources */,
 				6B3E79EE19D48B7F006071F7 /* Frameworks */,
@@ -251,14 +251,14 @@
 			);
 			dependencies = (
 			);
-			name = StarscreamTests;
+			name = "Starscream iOSTests";
 			productName = StarscreamTests;
-			productReference = 6B3E79F119D48B7F006071F7 /* StarscreamTests.xctest */;
+			productReference = 6B3E79F119D48B7F006071F7 /* Starscream iOSTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		D9C3E35E19E48FF1009FC285 /* StarscreamOSX */ = {
+		D9C3E35E19E48FF1009FC285 /* Starscream OSX */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D9C3E37619E48FF1009FC285 /* Build configuration list for PBXNativeTarget "StarscreamOSX" */;
+			buildConfigurationList = D9C3E37619E48FF1009FC285 /* Build configuration list for PBXNativeTarget "Starscream OSX" */;
 			buildPhases = (
 				D9C3E35A19E48FF1009FC285 /* Sources */,
 				D9C3E35B19E48FF1009FC285 /* Frameworks */,
@@ -269,14 +269,14 @@
 			);
 			dependencies = (
 			);
-			name = StarscreamOSX;
+			name = "Starscream OSX";
 			productName = StarscreamOSX;
 			productReference = D9C3E35F19E48FF1009FC285 /* Starscream.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		D9C3E36819E48FF1009FC285 /* StarscreamOSXTests */ = {
+		D9C3E36819E48FF1009FC285 /* Starscream OSXTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D9C3E37719E48FF1009FC285 /* Build configuration list for PBXNativeTarget "StarscreamOSXTests" */;
+			buildConfigurationList = D9C3E37719E48FF1009FC285 /* Build configuration list for PBXNativeTarget "Starscream OSXTests" */;
 			buildPhases = (
 				D9C3E36519E48FF1009FC285 /* Sources */,
 				D9C3E36619E48FF1009FC285 /* Frameworks */,
@@ -287,9 +287,9 @@
 			dependencies = (
 				D9C3E36C19E48FF1009FC285 /* PBXTargetDependency */,
 			);
-			name = StarscreamOSXTests;
+			name = "Starscream OSXTests";
 			productName = StarscreamOSXTests;
-			productReference = D9C3E36919E48FF1009FC285 /* StarscreamOSXTests.xctest */;
+			productReference = D9C3E36919E48FF1009FC285 /* Starscream OSXTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
@@ -300,7 +300,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = Vluxe;
 				TargetAttributes = {
 					091277961BD673A70003036D = {
@@ -308,18 +308,22 @@
 					};
 					0912779F1BD673A70003036D = {
 						CreatedOnToolsVersion = 7.1;
+						LastSwiftMigration = 0810;
 					};
 					6B3E79E519D48B7F006071F7 = {
 						CreatedOnToolsVersion = 6.0.1;
+						LastSwiftMigration = 0800;
 					};
 					6B3E79F019D48B7F006071F7 = {
 						CreatedOnToolsVersion = 6.0.1;
+						LastSwiftMigration = 0810;
 					};
 					D9C3E35E19E48FF1009FC285 = {
 						CreatedOnToolsVersion = 6.1;
 					};
 					D9C3E36819E48FF1009FC285 = {
 						CreatedOnToolsVersion = 6.1;
+						LastSwiftMigration = 0810;
 					};
 				};
 			};
@@ -335,12 +339,12 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				6B3E79E519D48B7F006071F7 /* Starscream */,
-				6B3E79F019D48B7F006071F7 /* StarscreamTests */,
-				D9C3E35E19E48FF1009FC285 /* StarscreamOSX */,
-				D9C3E36819E48FF1009FC285 /* StarscreamOSXTests */,
-				091277961BD673A70003036D /* StarscreamTv */,
-				0912779F1BD673A70003036D /* StarscreamTvTests */,
+				6B3E79E519D48B7F006071F7 /* Starscream iOS */,
+				6B3E79F019D48B7F006071F7 /* Starscream iOSTests */,
+				D9C3E35E19E48FF1009FC285 /* Starscream OSX */,
+				D9C3E36819E48FF1009FC285 /* Starscream OSXTests */,
+				091277961BD673A70003036D /* Starscream tvOS */,
+				0912779F1BD673A70003036D /* Starscream tvOSTests */,
 			);
 		};
 /* End PBXProject section */
@@ -404,7 +408,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CADAB511BEBD068005DE2F0 /* StarscreamTests.swift in Sources */,
+				742419BE1DC6BDBA003ACE43 /* StarscreamTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -421,7 +425,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6B3E7A0319D48C2F006071F7 /* StarscreamTests.swift in Sources */,
+				742419BC1DC6BDBA003ACE43 /* StarscreamTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -438,7 +442,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D9C3E37819E4903F009FC285 /* StarscreamTests.swift in Sources */,
+				742419BD1DC6BDBA003ACE43 /* StarscreamTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -447,12 +451,12 @@
 /* Begin PBXTargetDependency section */
 		091277A31BD673A70003036D /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 091277961BD673A70003036D /* StarscreamTv */;
+			target = 091277961BD673A70003036D /* Starscream tvOS */;
 			targetProxy = 091277A21BD673A70003036D /* PBXContainerItemProxy */;
 		};
 		D9C3E36C19E48FF1009FC285 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = D9C3E35E19E48FF1009FC285 /* StarscreamOSX */;
+			target = D9C3E35E19E48FF1009FC285 /* Starscream OSX */;
 			targetProxy = D9C3E36B19E48FF1009FC285 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
@@ -477,6 +481,7 @@
 				PRODUCT_NAME = Starscream;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -502,6 +507,8 @@
 				PRODUCT_NAME = Starscream;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -510,6 +517,8 @@
 		091277AC1BD673A70003036D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				CLANG_ENABLE_MODULES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
@@ -517,6 +526,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.vluxe.StarscreamTvTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
@@ -524,6 +535,8 @@
 		091277AD1BD673A70003036D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				CLANG_ENABLE_MODULES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -532,6 +545,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.vluxe.StarscreamTvTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Release;
@@ -540,6 +555,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -549,8 +565,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -560,6 +578,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -587,6 +606,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -596,8 +616,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -606,6 +628,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -639,10 +662,11 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Starscream;
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -663,15 +687,19 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Starscream;
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
 		6B3E79FD19D48B7F006071F7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				CLANG_ENABLE_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -684,12 +712,16 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		6B3E79FE19D48B7F006071F7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				CLANG_ENABLE_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -698,6 +730,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -722,6 +756,7 @@
 				PRODUCT_NAME = Starscream;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				VALID_ARCHS = x86_64;
 			};
 			name = Debug;
@@ -744,6 +779,8 @@
 				PRODUCT_NAME = Starscream;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				VALID_ARCHS = x86_64;
 			};
 			name = Release;
@@ -751,6 +788,8 @@
 		D9C3E37419E48FF1009FC285 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
@@ -766,12 +805,16 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		D9C3E37519E48FF1009FC285 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -784,13 +827,15 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
-		091277A81BD673A70003036D /* Build configuration list for PBXNativeTarget "StarscreamTv" */ = {
+		091277A81BD673A70003036D /* Build configuration list for PBXNativeTarget "Starscream tvOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				091277A91BD673A70003036D /* Debug */,
@@ -799,7 +844,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		091277AB1BD673A70003036D /* Build configuration list for PBXNativeTarget "StarscreamTvTests" */ = {
+		091277AB1BD673A70003036D /* Build configuration list for PBXNativeTarget "Starscream tvOSTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				091277AC1BD673A70003036D /* Debug */,
@@ -817,7 +862,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		6B3E79F919D48B7F006071F7 /* Build configuration list for PBXNativeTarget "Starscream" */ = {
+		6B3E79F919D48B7F006071F7 /* Build configuration list for PBXNativeTarget "Starscream iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6B3E79FA19D48B7F006071F7 /* Debug */,
@@ -826,7 +871,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		6B3E79FC19D48B7F006071F7 /* Build configuration list for PBXNativeTarget "StarscreamTests" */ = {
+		6B3E79FC19D48B7F006071F7 /* Build configuration list for PBXNativeTarget "Starscream iOSTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6B3E79FD19D48B7F006071F7 /* Debug */,
@@ -835,7 +880,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D9C3E37619E48FF1009FC285 /* Build configuration list for PBXNativeTarget "StarscreamOSX" */ = {
+		D9C3E37619E48FF1009FC285 /* Build configuration list for PBXNativeTarget "Starscream OSX" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D9C3E37219E48FF1009FC285 /* Debug */,
@@ -844,7 +889,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D9C3E37719E48FF1009FC285 /* Build configuration list for PBXNativeTarget "StarscreamOSXTests" */ = {
+		D9C3E37719E48FF1009FC285 /* Build configuration list for PBXNativeTarget "Starscream OSXTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D9C3E37419E48FF1009FC285 /* Debug */,
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0810"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "6B3E79E519D48B7F006071F7"
               BuildableName = "Starscream.framework"
-               BlueprintName = "Starscream"
+               BlueprintName = "Starscream iOS"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -47,7 +47,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "6B3E79E519D48B7F006071F7"
            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream"
+            BlueprintName = "Starscream iOS"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -65,7 +65,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "6B3E79E519D48B7F006071F7"
            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream"
+            BlueprintName = "Starscream iOS"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0810"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
               BuildableName = "Starscream.framework"
-               BlueprintName = "StarscreamOSX"
+               BlueprintName = "Starscream OSX"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -29,8 +29,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "D9C3E36819E48FF1009FC285"
-               BuildableName = "StarscreamOSXTests.xctest"
-               BlueprintName = "StarscreamOSXTests"
+               BuildableName = "Starscream OSXTests.xctest"
+               BlueprintName = "Starscream OSXTests"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -47,8 +47,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "D9C3E36819E48FF1009FC285"
-               BuildableName = "StarscreamOSXTests.xctest"
-               BlueprintName = "StarscreamOSXTests"
+               BuildableName = "Starscream OSXTests.xctest"
+               BlueprintName = "Starscream OSXTests"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </TestableReference>
@@ -58,7 +58,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
            BuildableName = "Starscream.framework"
-            BlueprintName = "StarscreamOSX"
+            BlueprintName = "Starscream OSX"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -80,7 +80,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
            BuildableName = "Starscream.framework"
-            BlueprintName = "StarscreamOSX"
+            BlueprintName = "Starscream OSX"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -98,7 +98,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
            BuildableName = "Starscream.framework"
-            BlueprintName = "StarscreamOSX"
+            BlueprintName = "Starscream OSX"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0810"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -15,8 +15,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-               BuildableName = "StarscreamTests.xctest"
-               BlueprintName = "StarscreamTests"
+               BuildableName = "Starscream iOSTests.xctest"
+               BlueprintName = "Starscream iOSTests"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -33,8 +33,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-               BuildableName = "StarscreamTests.xctest"
-               BlueprintName = "StarscreamTests"
+               BuildableName = "Starscream iOSTests.xctest"
+               BlueprintName = "Starscream iOSTests"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </TestableReference>
@@ -43,8 +43,8 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-            BuildableName = "StarscreamTests.xctest"
-            BlueprintName = "StarscreamTests"
+            BuildableName = "Starscream iOSTests.xctest"
+            BlueprintName = "Starscream iOSTests"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -65,8 +65,8 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-            BuildableName = "StarscreamTests.xctest"
-            BlueprintName = "StarscreamTests"
+            BuildableName = "Starscream iOSTests.xctest"
+            BlueprintName = "Starscream iOSTests"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -83,8 +83,8 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-            BuildableName = "StarscreamTests.xctest"
-            BlueprintName = "StarscreamTests"
+            BuildableName = "Starscream iOSTests.xctest"
+            BlueprintName = "Starscream iOSTests"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0810"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "091277961BD673A70003036D"
               BuildableName = "Starscream.framework"
-               BlueprintName = "StarscreamTv"
+               BlueprintName = "Starscream tvOS"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -29,8 +29,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "0912779F1BD673A70003036D"
-               BuildableName = "StarscreamTvTests.xctest"
-               BlueprintName = "StarscreamTvTests"
+               BuildableName = "Starscream tvOSTests.xctest"
+               BlueprintName = "Starscream tvOSTests"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -47,8 +47,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "0912779F1BD673A70003036D"
-               BuildableName = "StarscreamTvTests.xctest"
-               BlueprintName = "StarscreamTvTests"
+               BuildableName = "Starscream tvOSTests.xctest"
+               BlueprintName = "Starscream tvOSTests"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </TestableReference>
@@ -58,7 +58,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "091277961BD673A70003036D"
            BuildableName = "Starscream.framework"
-            BlueprintName = "StarscreamTv"
+            BlueprintName = "Starscream tvOS"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -80,7 +80,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "091277961BD673A70003036D"
            BuildableName = "Starscream.framework"
-            BlueprintName = "StarscreamTv"
+            BlueprintName = "Starscream tvOS"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -98,7 +98,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "091277961BD673A70003036D"
            BuildableName = "Starscream.framework"
-            BlueprintName = "StarscreamTv"
+            BlueprintName = "Starscream tvOS"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -27,7 +27,7 @@ class StarscreamTests: XCTestCase {
    
    func testPerformanceExample() {
        // This is an example of a performance test case.
-        self.measureBlock() {
+        self.measure() {
            // Put the code you want to measure the time of here.
        }
    }
@@ -59,6 +59,20 @@
 			remoteGlobalIDString = 6B3E79E519D48B7F006071F7;
 			remoteInfo = Starscream;
 		};
+		5C42C3D51D8DF51C00947AA2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 091277971BD673A70003036D;
+			remoteInfo = "Starscream tvOS";
+		};
+		5C42C3D71D8DF51C00947AA2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 091277A01BD673A70003036D;
+			remoteInfo = "Starscream tvOSTests";
+		};
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
@@ -158,6 +172,8 @@
 				5C178E4B1B62D0EF00A97204 /* StarscreamTests.xctest */,
 				5C178E4D1B62D0EF00A97204 /* Starscream.framework */,
 				5C178E4F1B62D0EF00A97204 /* StarscreamOSXTests.xctest */,
+				5C42C3D61D8DF51C00947AA2 /* Starscream.framework */,
+				5C42C3D81D8DF51C00947AA2 /* Starscream tvOSTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -214,9 +230,11 @@
 				TargetAttributes = {
 					5C178E1B1B62D0B900A97204 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0800;
 					};
 					5C178E301B62D0B900A97204 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0800;
 						TestTargetID = 5C178E1B1B62D0B900A97204;
 					};
 				};
@@ -257,7 +275,7 @@
 		5C178E4B1B62D0EF00A97204 /* StarscreamTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = StarscreamTests.xctest;
+			path = "Starscream iOSTests.xctest";
 			remoteRef = 5C178E4A1B62D0EF00A97204 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -271,10 +289,24 @@
 		5C178E4F1B62D0EF00A97204 /* StarscreamOSXTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = StarscreamOSXTests.xctest;
+			path = "Starscream OSXTests.xctest";
 			remoteRef = 5C178E4E1B62D0EF00A97204 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		5C42C3D61D8DF51C00947AA2 /* Starscream.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Starscream.framework;
+			remoteRef = 5C42C3D51D8DF51C00947AA2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5C42C3D81D8DF51C00947AA2 /* Starscream tvOSTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "Starscream tvOSTests.xctest";
+			remoteRef = 5C42C3D71D8DF51C00947AA2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */

 /* Begin PBXResourcesBuildPhase section */
@@ -440,6 +472,7 @@
 				INFOPLIST_FILE = Autobahn/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -450,6 +483,7 @@
 				INFOPLIST_FILE = Autobahn/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -468,6 +502,7 @@
 				INFOPLIST_FILE = AutobahnTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Autobahn.app/Autobahn";
 			};
 			name = Debug;
@@ -483,6 +518,7 @@
 				INFOPLIST_FILE = AutobahnTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Autobahn.app/Autobahn";
 			};
 			name = Release;
@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    var window: UIWindow?


-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
        // Override point for customization after application launch.
        return true
    }

-    func applicationWillResignActive(application: UIApplication) {
+    func applicationWillResignActive(_ application: UIApplication) {
        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
    }

-    func applicationDidEnterBackground(application: UIApplication) {
+    func applicationDidEnterBackground(_ application: UIApplication) {
        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
    }

-    func applicationWillEnterForeground(application: UIApplication) {
+    func applicationWillEnterForeground(_ application: UIApplication) {
        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
    }

-    func applicationDidBecomeActive(application: UIApplication) {
+    func applicationDidBecomeActive(_ application: UIApplication) {
        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
    }

-    func applicationWillTerminate(application: UIApplication) {
+    func applicationWillTerminate(_ application: UIApplication) {
        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
    }

@@ -12,7 +12,6 @@ import Starscream
 class ViewController: UIViewController {
    
    let host = "localhost:9001"
-    let scheme = "ws"
    var socketArray = [WebSocket]()
    var caseCount = 300 //starting cases
    override func viewDidLoad() {
@@ -21,12 +20,13 @@ class ViewController: UIViewController {
        //getTestInfo(1)
    }
    
-    func removeSocket(s: WebSocket) {
-        self.socketArray = self.socketArray.filter{$0 != s}
+    func removeSocket(_ s: WebSocket) {
+        socketArray = socketArray.filter{$0 != s}
    }
    
    func getCaseCount() {
-        let s = WebSocket(url: NSURL(scheme: scheme, host: host, path: "/getCaseCount")!, protocols: [])
+        
+        let s = WebSocket(url: URL(string: "ws://\(host)/getCaseCount")!, protocols: [])
        socketArray.append(s)
        s.onText = {[unowned self] (text: String) in
            if let c = Int(text) {
@@ -41,7 +41,7 @@ class ViewController: UIViewController {
        s.connect()
    }
    
-    func getTestInfo(caseNum: Int) {
+    func getTestInfo(_ caseNum: Int) {
        let s = createSocket("getCaseInfo",caseNum)
        socketArray.append(s)
        s.onText = {(text: String) in
@@ -72,14 +72,14 @@ class ViewController: UIViewController {
        s.connect()
    }
    
-    func runTest(caseNum: Int) {
+    func runTest(_ caseNum: Int) {
        let s = createSocket("runCase",caseNum)
        self.socketArray.append(s)
        s.onText = {(text: String) in
-            s.writeString(text)
+            s.write(string: text)
        }
-        s.onData = {(data: NSData) in
-            s.writeData(data)
+        s.onData = {(data: Data) in
+            s.write(data: data)
        }
        var once = false
        s.onDisconnect = {[unowned self] (error: NSError?) in
@@ -93,14 +93,14 @@ class ViewController: UIViewController {
        s.connect()
    }
    
-    func verifyTest(caseNum: Int) {
+    func verifyTest(_ caseNum: Int) {
        let s = createSocket("getCaseStatus",caseNum)
        self.socketArray.append(s)
        s.onText = {(text: String) in
-            let data = text.dataUsingEncoding(NSUTF8StringEncoding)
+            let data = text.data(using: String.Encoding.utf8)
            do {
-                let resp: AnyObject? = try NSJSONSerialization.JSONObjectWithData(data!,
-                    options: NSJSONReadingOptions())
+                let resp: Any? = try JSONSerialization.jsonObject(with: data!,
+                    options: JSONSerialization.ReadingOptions())
                if let dict = resp as? Dictionary<String,String> {
                    if let status = dict["behavior"] {
                        if status == "OK" {
@@ -140,12 +140,11 @@ class ViewController: UIViewController {
        s.connect()
    }
    
-    func createSocket(cmd: String, _ caseNum: Int) -> WebSocket {
-        return WebSocket(url: NSURL(scheme: scheme,
-            host: host, path: buildPath(cmd,caseNum))!, protocols: [])
+    func createSocket(_ cmd: String, _ caseNum: Int) -> WebSocket {
+        return WebSocket(url: URL(string: "ws://\(host)\(buildPath(cmd,caseNum))")!, protocols: [])
    }
    
-    func buildPath(cmd: String, _ caseNum: Int) -> String {
+    func buildPath(_ cmd: String, _ caseNum: Int) -> String {
        return "/\(cmd)?case=\(caseNum)&agent=Starscream"
    }

@@ -28,7 +28,7 @@ class AutobahnTests: XCTestCase {
    
    func testPerformanceExample() {
        // This is an example of a performance test case.
-        self.measureBlock() {
+        self.measure() {
            // Put the code you want to measure the time of here.
        }
    }
@@ -37,6 +37,20 @@
 			remoteGlobalIDString = D9C3E36919E48FF1009FC285;
 			remoteInfo = StarscreamOSXTests;
 		};
+		5C42C3E01D8F31DC00947AA2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 091277971BD673A70003036D;
+			remoteInfo = "Starscream tvOS";
+		};
+		5C42C3E21D8F31DC00947AA2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 091277A01BD673A70003036D;
+			remoteInfo = "Starscream tvOSTests";
+		};
 		6B3E7A0D19D48D00006071F7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
@@ -129,9 +143,11 @@
 			isa = PBXGroup;
 			children = (
 				6B3E7A0E19D48D00006071F7 /* Starscream.framework */,
-				6B3E7A1019D48D00006071F7 /* StarscreamTests.xctest */,
+				6B3E7A1019D48D00006071F7 /* Starscream iOSTests.xctest */,
 				5C06AE8B1B08044600D41060 /* Starscream.framework */,
 				5C06AE8D1B08044600D41060 /* StarscreamOSXTests.xctest */,
+				5C42C3E11D8F31DC00947AA2 /* Starscream.framework */,
+				5C42C3E31D8F31DC00947AA2 /* Starscream tvOSTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -165,11 +181,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0600;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = vluxe;
 				TargetAttributes = {
 					5C765ADA199A6DAA003D9110 = {
 						CreatedOnToolsVersion = 6.0;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -205,13 +222,27 @@
 			remoteRef = 5C06AE8A1B08044600D41060 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		5C06AE8D1B08044600D41060 /* StarscreamOSXTests.xctest */ = {
+		5C06AE8D1B08044600D41060 /* Starscream OSXTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = StarscreamOSXTests.xctest;
+			path = "Starscream OSXTests.xctest";
 			remoteRef = 5C06AE8C1B08044600D41060 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		5C42C3E11D8F31DC00947AA2 /* Starscream.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Starscream.framework;
+			remoteRef = 5C42C3E01D8F31DC00947AA2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5C42C3E31D8F31DC00947AA2 /* Starscream tvOSTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "Starscream tvOSTests.xctest";
+			remoteRef = 5C42C3E21D8F31DC00947AA2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		6B3E7A0E19D48D00006071F7 /* Starscream.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -219,10 +250,10 @@
 			remoteRef = 6B3E7A0D19D48D00006071F7 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		6B3E7A1019D48D00006071F7 /* StarscreamTests.xctest */ = {
+		6B3E7A1019D48D00006071F7 /* Starscream iOSTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = StarscreamTests.xctest;
+			path = "Starscream iOSTests.xctest";
 			remoteRef = 6B3E7A0F19D48D00006071F7 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -285,15 +316,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -328,8 +363,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -337,6 +374,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -346,6 +384,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -358,7 +397,9 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				INFOPLIST_FILE = SimpleTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -369,7 +410,9 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				INFOPLIST_FILE = SimpleTest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0800"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
      </BuildActionEntries>
   </BuildAction>
   <TestAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -62,17 +62,21 @@
            ReferencedContainer = "container:SimpleTest.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
   </TestAction>
   <LaunchAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "5C765ADA199A6DAA003D9110"
@@ -81,16 +85,24 @@
            ReferencedContainer = "container:SimpleTest.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
      <AdditionalOptions>
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
+      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "5C765ADA199A6DAA003D9110"
@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    var window: UIWindow?


-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
        // Override point for customization after application launch.
        return true
    }

-    func applicationWillResignActive(application: UIApplication) {
+    func applicationWillResignActive(_ application: UIApplication) {
        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
    }

-    func applicationDidEnterBackground(application: UIApplication) {
+    func applicationDidEnterBackground(_ application: UIApplication) {
        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
    }

-    func applicationWillEnterForeground(application: UIApplication) {
+    func applicationWillEnterForeground(_ application: UIApplication) {
        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
    }

-    func applicationDidBecomeActive(application: UIApplication) {
+    func applicationDidBecomeActive(_ application: UIApplication) {
        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
    }

-    func applicationWillTerminate(application: UIApplication) {
+    func applicationWillTerminate(_ application: UIApplication) {
        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
    }

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -10,7 +10,7 @@ import UIKit
 import Starscream

 class ViewController: UIViewController, WebSocketDelegate {
-    var socket = WebSocket(url: NSURL(string: "ws://localhost:8080/")!, protocols: ["chat", "superchat"])
+    var socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat", "superchat"])
    
    override func viewDidLoad() {
        super.viewDidLoad()
@@ -20,11 +20,11 @@ class ViewController: UIViewController, WebSocketDelegate {
    
    // MARK: Websocket Delegate Methods.
    
-    func websocketDidConnect(ws: WebSocket) {
+    func websocketDidConnect(socket: WebSocket) {
        print("websocket is connected")
    }
    
-    func websocketDidDisconnect(ws: WebSocket, error: NSError?) {
+    func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
        if let e = error {
            print("websocket is disconnected: \(e.localizedDescription)")
        } else {
@@ -32,23 +32,23 @@ class ViewController: UIViewController, WebSocketDelegate {
        }
    }
    
-    func websocketDidReceiveMessage(ws: WebSocket, text: String) {
+    func websocketDidReceiveMessage(socket: WebSocket, text: String) {
        print("Received text: \(text)")
    }
    
-    func websocketDidReceiveData(ws: WebSocket, data: NSData) {
-        print("Received data: \(data.length)")
+    func websocketDidReceiveData(socket: WebSocket, data: Data) {
+        print("Received data: \(data.count)")
    }
    
    // MARK: Write Text Action
    
-    @IBAction func writeText(sender: UIBarButtonItem) {
-        socket.writeString("hello there!")
+    @IBAction func writeText(_ sender: UIBarButtonItem) {
+        socket.write(string: "hello there!")
    }
    
    // MARK: Disconnect Action
    
-    @IBAction func disconnect(sender: UIBarButtonItem) {
+    @IBAction func disconnect(_ sender: UIBarButtonItem) {
        if socket.isConnected {
            sender.title = "Connect"
            socket.disconnect()
Author	SHA1	Message	Date
daltoniam	c13584b99c	bumped spec	2016-11-14 22:29:34 -06:00
Dalton	178c3e8a49	Merge pull request #277 from nuclearace/master Fix Swift package manager	2016-11-01 18:57:49 -05:00
Erik	ccc1b703dd	Fix Swift package manager	2016-10-30 19:47:58 -04:00
daltoniam	1b64f78542	version bump	2016-10-26 20:41:30 -05:00
Dalton	549500a503	Merge pull request #253 from noremac/master Only disable SSL cert validation if we are using a secure scheme.	2016-10-26 20:26:58 -05:00
Dalton	22d57dca07	Merge pull request #276 from profer/master Enable custom trust validation	2016-10-26 20:26:30 -05:00
daltoniam	dd5119cfce	fix for #261	2016-10-26 20:25:39 -05:00
Wolfgang Profer	a6b2e4329b	Enable custom trust validation Change WebSocket to use a protocol for trust validation instead of SSLSecurity directly. This allows users of Starscream to supply their own validation logic.	2016-10-24 13:43:44 +02:00
Dalton	931e3ba8ae	Merge pull request #266 from fjcaetano/master 'Open'ing classes	2016-10-11 23:23:09 -05:00
Dalton	7476f5196e	Merge pull request #267 from Dipak99041012/2.0.0HotFixes [Fixup] crash for SSL Pinning Strange crash	2016-10-11 23:20:28 -05:00
Dipak Kasabwala	20285cce97	[Fixup] crash for SSL Pinning Strange crash	2016-10-10 18:14:01 -04:00
Flávio Caetano	8e1de1d475	'Open'ing classes	2016-10-10 17:47:13 -03:00
Cameron Pulsford	acf64adc24	Only disable SSL cert validation if we are using a secure scheme.	2016-09-30 14:49:26 -04:00
Dalton	b0fa08cde4	Merge pull request #259 from robinkunde/master Improve clarity of asyncAfter code and other timeout	2016-09-30 13:34:49 -05:00
Dalton	9d32864ab4	Merge pull request #260 from ujell/master Fixed parameter names in documentation	2016-09-30 13:02:28 -05:00
Yücel Uzun	7ef2bc41e0	Fixed parameter names in documentation	2016-09-29 18:50:22 +02:00
Robin Kunde	24e32a78e3	improve clarity of asyncAfter code and other timeout	2016-09-28 12:27:48 -04:00
daltoniam	d831901ff4	more things to get cocoapods working	2016-09-18 16:35:32 -05:00
daltoniam	26b03ddaef	swift 3 support	2016-09-18 16:28:53 -05:00
daltoniam	d94c3ff3b4	cocoapods...	2016-09-18 16:18:21 -05:00
daltoniam	60d853742c	cocoapods...	2016-09-18 16:16:37 -05:00
daltoniam	8563f6b85e	osx podspec update	2016-09-18 16:13:23 -05:00
daltoniam	c889a6c977	available for osx	2016-09-18 16:07:39 -05:00
daltoniam	8f3761215b	conflict fixes	2016-09-18 15:46:05 -05:00
daltoniam	cdf8caeb1a	swift 2.3 update	2016-09-18 15:43:12 -05:00
daltoniam	00d8fae6cd	swift3 updates	2016-09-18 15:37:55 -05:00
Dalton	46db9a75f0	Merge pull request #243 from cpinski/writeQueueQOS Added initializer to set the QOS of the write queue	2016-09-13 21:21:48 -05:00
Christopher Pinski	5a3adc7756	Added initializer to set the QOS of the write queue	2016-08-29 15:44:05 -05:00
Austin Cherry	b1472f2a99	Merge pull request #242 from pvzig/xcode8b6 Xcode8b6	2016-08-28 13:15:57 -07:00
Peter Zignego	34ed785564	Update example test syntax	2016-08-28 11:26:03 -04:00
Peter Zignego	08d2da1221	Set SWIFT_VERSION for all targets	2016-08-28 11:25:52 -04:00
Dalton	5c607a80ce	Merge pull request #235 from nuclearace/swift3-nuclearace Beta6 update	2016-08-22 13:30:48 -07:00
Erik	3aac891e83	Merge dalton/master and update for swift3	2016-08-21 17:07:07 -04:00
Dalton	32fb0aa87e	Merge pull request #230 from cpinski/swift2.3 Adding full support for swift 2.3	2016-08-14 15:21:25 -07:00
Dalton	473a1382ac	Merge pull request #227 from tractus/swift3 Updated for Xcode 8 Beta 4	2016-08-08 17:41:39 -07:00
Christopher Pinski	9c210e006e	Adding full support for swift 2.3	2016-08-05 10:47:12 -05:00
Dalton	c767cb2a54	Merge pull request #225 from ThinkChaos/master Fix typo that prevents SSL detection	2016-08-03 14:57:31 -07:00
Trey Richards	cdd1224a71	Updated for Xcode 8 Beta 4	2016-08-02 15:30:56 -07:00
ThinkChaos	7c09aa08b4	Fix typo that prevents SSL detection	2016-07-31 10:18:00 +02:00
Dalton	c2782b5452	Merge pull request #222 from Danappelxx/swift3 Fix typo in `dequeueInput`	2016-07-21 14:42:02 -07:00
Dan Appel	14bc9ad90f	Fix typo in `dequeueInput` This was breaking messages that were sent in chunks, since only the first chunk would be processed.	2016-07-20 18:51:58 -07:00
Dalton	bdab51f4af	Merge pull request #219 from nathanborror/master Fixing 'queue' naming error	2016-07-12 18:39:42 -07:00
Nathan Borror	26297ed3c1	Fixing 'queue' naming error	2016-07-12 15:57:03 -07:00
Dalton	600815b240	Merge pull request #211 from Abeansits/master Fixed formatting on a a few places to be more consistent.	2016-07-08 23:00:32 -07:00
Sebastian Nystorm	5fba5b83b4	Fixed formatting on a a few places to be more consistent. Renamed a few vars to be more descriptive. Added some MARKS to divide the code inte clearer chunks. Also fixed a few spelling mistakes.	2016-07-03 22:19:08 -07:00
Dalton	c39043cc29	Merge pull request #209 from Abeansits/master Returned custom close reason from server according to RFC 6455	2016-06-24 19:35:44 -07:00
Sebastian Nystorm	dd6bfa24b7	Returned custom close reason from server according to RFC 6455	2016-06-23 12:26:07 -07:00
daltoniam	64661bc6ce	Merge branch 'master' of https://github.com/daltoniam/Starscream	2016-06-18 19:23:02 -07:00
daltoniam	0f03fab95d	swift 3 branch README note	2016-06-18 19:22:45 -07:00
daltoniam	c7b52b4485	swift 3 changes to build with xCode 8. More cleanup staged	2016-06-18 19:20:26 -07:00
Dalton	fc35de78a5	Merge pull request #199 from dreymonde/notifications Posting NSNotification about websocket connection and disconnection	2016-06-02 20:41:52 -07:00
Oleg Dreyman	d911dc1adf	README update to include information about NSNotifications	2016-05-29 20:19:55 +03:00
Oleg Dreyman	f5f777c507	Posting errors with userInfo on WebsocketDidDisconnectNotification	2016-05-28 01:37:26 +03:00
Oleg Dreyman	cca4af6112	Posting NSNotification about websocket connection and disconnection	2016-05-28 01:16:03 +03:00
daltoniam	afad19ca84	changes for swift 3	2016-05-21 21:16:59 -07:00
daltoniam	b159d03640	fixes #185	2016-05-16 22:27:51 -07:00
daltoniam	d5aeefd853	switch from recusion to loop	2016-05-16 22:01:20 -07:00
Dalton	f0f2ceee20	Merge pull request #189 from mayoff/upstream process buffered messages non-recursively	2016-05-16 18:51:47 -07:00
Rob Mayoff	10cfb16197	process buffered messages non-recursively	2016-05-11 15:37:14 -05:00
daltoniam	bf0146db26	1.1.3 release	2016-03-31 12:25:30 -07:00
Austin Cherry	cf6def9453	Merge pull request #178 from noremac/dev/cameron.pulsford/write-complete Adds an optional `writeCompletion` callback	2016-03-01 10:59:39 -08:00
Cameron Pulsford	8db1a45c6c	Adds an optional "write did complete" callback	2016-03-01 09:24:16 -05:00
Austin Cherry	592da86d06	Merge pull request #177 from noremac/dev/cameron.pulsford/var-let Replaces a force-unwrapped var with a let	2016-02-29 23:07:41 -08:00
Cameron Pulsford	43ade49abe	Replaces a force-unwrapped NSData `var` with a `let`	2016-02-29 00:18:35 -05:00
Dalton	e32674a1ea	Merge pull request #175 from impossibleventures/master Set "Require Only App-Extension-Safe API" to YES	2016-02-25 12:56:44 -08:00
Ryan Peck	7e49eb2458	Set APPLICATION_EXTENSION_API_ONLY = YES	2016-02-24 18:27:11 -06:00
Dalton	53c19d2388	Merge pull request #174 from nicolasbigot/master Remove `var` parameters to conform to Swift 3	2016-02-24 11:42:36 -08:00
Nicolas Bigot	ab02d55700	Fix comments spaces	2016-02-24 09:58:09 +01:00
Nicolas Bigot	fa0865fcac	Remove var parameters to conform to Swift 3	2016-02-24 09:55:23 +01:00
Dalton	5d185b41cb	Merge pull request #171 from ReadmeCritic/master Correct the spelling of CocoaPods in README	2016-02-12 18:19:34 -08:00
ReadmeCritic	ba1d7db873	Correct the spelling of CocoaPods in README	2016-02-12 15:47:14 -08:00
Dalton	e2eea95ea5	Merge pull request #170 from mayoff/master change all use of ++ to += 1	2016-02-11 10:43:14 -08:00
Rob Mayoff	363e331a84	change all use of ++ to += 1 Swift 2.2 deprecates ++ and --, and Swift 3 will remove them.	2016-02-11 11:59:27 -06:00
daltoniam	75721192c9	Merge branch 'master' of https://github.com/daltoniam/Starscream	2016-02-08 19:04:10 -08:00
daltoniam	0c4a99588f	bumped version	2016-02-08 19:03:41 -08:00
Dalton	4387f497c9	Merge pull request #167 from ayking/master fix : connect to a shutdown server will not get error call back	2016-02-08 18:57:00 -08:00
Dalton	d87b422950	Merge pull request #168 from onevcat/master Fix crashing when reconnecting repeatedly	2016-02-08 18:55:26 -08:00
onevcat	c5569dff12	Fix crashing when reconnecting repeatedly	2016-02-08 22:40:11 +08:00
Alan YU	6b303eafec	fix : connect to a shutdown server will not get error call back	2016-02-05 17:12:33 +08:00
daltoniam	0f8dd95f70	proper fix for #164	2016-01-29 10:52:18 -08:00
daltoniam	ede7c9aa89	Merge branch 'master' of https://github.com/daltoniam/Starscream	2016-01-27 21:39:38 -08:00
daltoniam	afefdff061	fixes for #158 , #159 , #161 , #164	2016-01-27 21:39:13 -08:00
Dalton	3a59333bac	Merge pull request #160 from kylebshr/master Simple update to examples for Swift 2 (println() to print())	2016-01-22 13:19:41 -08:00
Kyle Bashour	1951d74516	Simple update to examples for Swift 2 (println() to print())	2016-01-22 13:00:04 -05:00
daltoniam	6c34076224	another possible fix for #158	2016-01-21 15:44:51 -08:00
daltoniam	f189e7c51f	possible fix for #158	2016-01-21 13:46:52 -08:00
daltoniam	95c91f9dbf	changelog update	2016-01-18 12:34:43 -08:00