Merge branch 'enhorn-swift2.3' into swift2.3

* enhorn-swift2.3:
  Changes so the legacy build setting is set on the project, instead of each target.
  Adds the legacy option to the build settings, so the project compiles.

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

@@ -542,9 +542,11 @@
 					};
 					572EF2371B51F18A00EEBB58 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0800;
 					};
 					572EF2411B51F18A00EEBB58 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -780,6 +782,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = SocketIO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -795,6 +798,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_NAME = SocketIO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -1164,6 +1168,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -1210,6 +1215,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "io.socket.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};

Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-Mac.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Source/SSLSecurity.swift

@@ -164,10 +164,9 @@ public class SSLSecurity : NSObject {
                 collect.append(SecCertificateCreateWithData(nil,cert)!)
             }
             SecTrustSetAnchorCertificates(trust,collect)
-            var result: SecTrustResultType = 0
+            var result = SecTrustResultType.Invalid
             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 {
@@ -211,7 +210,7 @@ public class SSLSecurity : NSObject {
         
         guard let trust = possibleTrust else { return nil }
         
-        var result: SecTrustResultType = 0
+        var result = SecTrustResultType.Invalid
         SecTrustEvaluate(trust, &result)
         return SecTrustCopyPublicKey(trust)
     }
@@ -257,4 +256,4 @@ public class SSLSecurity : NSObject {
     }
     
     
-}
+}

Source/SocketEngine.swift

@@ -213,8 +213,8 @@ public final class SocketEngine : NSObject, NSURLSessionDelegate, SocketEnginePo
             return (NSURL(), NSURL())
         }
 
-        let urlPolling = NSURLComponents(string: url.absoluteString)!
-        let urlWebSocket = NSURLComponents(string: url.absoluteString)!
+        let urlPolling = NSURLComponents(URL: url, resolvingAgainstBaseURL: true)!
+        let urlWebSocket = NSURLComponents(URL: url, resolvingAgainstBaseURL: true)!
         var queryString = ""
         
         urlWebSocket.path = socketPath
@@ -375,7 +375,7 @@ public final class SocketEngine : NSObject, NSURLSessionDelegate, SocketEnginePo
                 upgradeWs = false
             }
             
-            if let pingInterval = json["pingInterval"] as? Double, pingTimeout = json["pingTimeout"] as? Double {
+            if let pingInterval = json["pingInterval"] as? Double, let pingTimeout = json["pingTimeout"] as? Double {
                 self.pingInterval = pingInterval / 1000.0
                 self.pingTimeout = pingTimeout / 1000.0
             }

Source/SocketIOClient.swift

@@ -72,7 +72,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
         self.config = config
         self.socketURL = socketURL
         
-        if socketURL.absoluteString.hasPrefix("https://") {
+        if socketURL.absoluteString?.hasPrefix("https://") ?? false {
             self.config.insert(.Secure(true))
         }
         

Source/SocketIOClientConfiguration.swift

@@ -78,7 +78,7 @@ public struct SocketIOClientConfiguration : ArrayLiteralConvertible, CollectionT
         return backingArray.generate()
     }
     
-    public mutating func insert(element: Element, replacing replace: Bool = true) {
+    public mutating func insert(_ element: Element, replacing replace: Bool = true) {
         for i in 0..<backingArray.count where backingArray[i] == element {
             guard replace else { return }
             

Source/WebSocket.swift

@@ -179,14 +179,14 @@ public class WebSocket: NSObject, NSStreamDelegate {
         createHTTPRequest()
         isConnecting = false
     }
-    
+
     /**
      Disconnect from the server. I send a Close control frame to the server, then expect the server to respond with a Close control frame and close the socket from its end. I notify my delegate once the socket has been closed.
-     
+
      If you supply a non-nil `forceTimeout`, I wait at most that long (in seconds) for the server to close the socket. After the timeout expires, I close the socket and notify my delegate.
-     
+
      If you supply a zero (or negative) `forceTimeout`, I immediately close the socket (without sending a Close control frame) and notify my delegate.
-     
+
      - Parameter forceTimeout: Maximum time to wait for the server to close the socket.
      */
     public func disconnect(forceTimeout forceTimeout: NSTimeInterval? = nil) {
@@ -198,18 +198,18 @@ public class WebSocket: NSObject, NSStreamDelegate {
             fallthrough
         case .None:
             writeError(CloseCode.Normal.rawValue)
-            
+
         default:
             disconnectStream(nil)
             break
         }
     }
-    
+
     /**
      Write a string to the websocket. This sends it as a text frame.
-     
+
      If you supply a non-nil completion block, I will perform it when the write completes.
-     
+
      - parameter str:        The string to write.
      - parameter completion: The (optional) completion handler.
      */
@@ -217,12 +217,12 @@ public class WebSocket: NSObject, NSStreamDelegate {
         guard isConnected else { return }
         dequeueWrite(str.dataUsingEncoding(NSUTF8StringEncoding)!, code: .TextFrame, writeCompletion: completion)
     }
-    
+
     /**
      Write binary data to the websocket. This sends it as a binary frame.
-     
+
      If you supply a non-nil completion block, I will perform it when the write completes.
-     
+
      - parameter data:       The data to write.
      - parameter completion: The (optional) completion handler.
      */
@@ -240,13 +240,13 @@ public class WebSocket: NSObject, NSStreamDelegate {
     
     /// Private method that starts the connection.
     private func createHTTPRequest() {
-        
+
         let urlRequest = CFHTTPMessageCreateRequest(kCFAllocatorDefault, "GET",
                                                     url, kCFHTTPVersion1_1).takeRetainedValue()
-        
+
         var port = url.port
         if port == nil {
-            if supportedSSLSchemes.contains(url.scheme) {
+            if supportedSSLSchemes.contains(url.scheme!) {
                 port = 443
             } else {
                 port = 80
@@ -294,7 +294,7 @@ public class WebSocket: NSObject, NSStreamDelegate {
     private func initStreamsWithData(data: NSData, _ port: Int) {
         //higher level API we will cut over to at some point
         //NSStream.getStreamsToHostWithName(url.host, port: url.port.integerValue, inputStream: &inputStream, outputStream: &outputStream)
-        
+
         var readStream: Unmanaged<CFReadStream>?
         var writeStream: Unmanaged<CFWriteStream>?
         let h: NSString = url.host!
@@ -304,7 +304,7 @@ public class WebSocket: NSObject, NSStreamDelegate {
         guard let inStream = inputStream, let outStream = outputStream else { return }
         inStream.delegate = self
         outStream.delegate = self
-        if supportedSSLSchemes.contains(url.scheme) {
+        if supportedSSLSchemes.contains(url.scheme!) {
             inStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
             outStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
         } else {
@@ -340,11 +340,11 @@ public class WebSocket: NSObject, NSStreamDelegate {
         CFWriteStreamSetDispatchQueue(outStream, WebSocket.sharedWorkQueue)
         inStream.open()
         outStream.open()
-        
+
         self.mutex.lock()
         self.readyToWrite = true
         self.mutex.unlock()
-        
+
         let bytes = UnsafePointer<UInt8>(data.bytes)
         var out = timeout * 1000000 // wait 5 seconds before giving up
         writeQueue.addOperationWithBlock { [weak self] in
@@ -365,7 +365,7 @@ public class WebSocket: NSObject, NSStreamDelegate {
     
     // Delegate for the stream methods. Processes incoming bytes.
     public func stream(aStream: NSStream, handleEvent eventCode: NSStreamEvent) {
-        
+
         if let sec = security where !certValidated && [.HasBytesAvailable, .HasSpaceAvailable].contains(eventCode) {
             let possibleTrust: AnyObject? = aStream.propertyForKey(kCFStreamPropertySSLPeerTrust as String)
             if let trust: AnyObject = possibleTrust {
@@ -400,7 +400,7 @@ public class WebSocket: NSObject, NSStreamDelegate {
         cleanupStream()
         doDisconnect(error)
     }
-    
+
     private func cleanupStream() {
         outputStream?.delegate = nil
         inputStream?.delegate = nil
@@ -421,7 +421,7 @@ public class WebSocket: NSObject, NSStreamDelegate {
         let buf = NSMutableData(capacity: BUFFER_MAX)
         let buffer = UnsafeMutablePointer<UInt8>(buf!.bytes)
         let length = inputStream!.read(buffer, maxLength: BUFFER_MAX)
-        
+
         guard length > 0 else { return }
         var process = false
         if inputQueue.count == 0 {
@@ -552,7 +552,7 @@ public class WebSocket: NSObject, NSStreamDelegate {
             buffer[offset + i] = UInt8((value >> (8*UInt64(7 - i))) & 0xff)
         }
     }
-    
+
     /// Process one message at the start of `buffer`. Return another buffer (sharing storage) that contains the leftover contents of `buffer` that I didn't process.
     @warn_unused_result
     private func processOneRawMessage(inBuffer buffer: UnsafeBufferPointer<UInt8>) -> UnsafeBufferPointer<UInt8> {
@@ -714,7 +714,7 @@ public class WebSocket: NSObject, NSStreamDelegate {
             return buffer.fromOffset(step)
         }
     }
-    
+
     /// Process all messages in the buffer if possible.
     private func processRawMessagesInBuffer(pointer: UnsafePointer<UInt8>, bufferLen: Int) {
         var buffer = UnsafeBufferPointer(start: pointer, count: bufferLen)
@@ -802,7 +802,7 @@ public class WebSocket: NSObject, NSStreamDelegate {
             let maskKey = UnsafeMutablePointer<UInt8>(buffer + offset)
             SecRandomCopyBytes(kSecRandomDefault, Int(sizeof(UInt32)), maskKey)
             offset += sizeof(UInt32)
-            
+
             for i in 0..<dataLength {
                 buffer[offset] = bytes[i] ^ maskKey[i % sizeof(UInt32)]
                 offset += 1
@@ -831,11 +831,11 @@ public class WebSocket: NSObject, NSStreamDelegate {
                             callback()
                         }
                     }
-                    
+
                     break
                 }
             }
-            
+
         }
     }
     
@@ -862,23 +862,23 @@ public class WebSocket: NSObject, NSStreamDelegate {
         mutex.unlock()
         cleanupStream()
     }
-    
+
 }
 
 private extension NSData {
-    
+
     convenience init(buffer: UnsafeBufferPointer<UInt8>) {
         self.init(bytes: buffer.baseAddress, length: buffer.count)
     }
-    
+
 }
 
 private extension UnsafeBufferPointer {
-    
+
     func fromOffset(offset: Int) -> UnsafeBufferPointer<Element> {
         return UnsafeBufferPointer<Element>(start: baseAddress.advancedBy(offset), count: count - offset)
     }
-    
+
 }
 
 private let emptyBuffer = UnsafeBufferPointer<UInt8>(start: nil, count: 0)