From d3aaaec9bb2983b23eb440f42558b4f44fd1975e Mon Sep 17 00:00:00 2001 From: Shane Cowherd Date: Mon, 8 Jan 2018 11:22:09 -0700 Subject: [PATCH] Updated Project Swift variable to 4.0 Fixed handleOpen(openData) bug that was not covered in the unit tests. --- Socket.IO-Client-Swift.xcodeproj/project.pbxproj | 6 ++++-- Source/SocketEngine.swift | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj index 809a0de..feaabdd 100644 --- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj +++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj @@ -1102,7 +1102,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1154,7 +1154,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.socket.$(PRODUCT_NAME:rfc1034identifier)"; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1313,6 +1313,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1364,6 +1365,7 @@ PRODUCT_NAME = SocketIO; SDKROOT = appletvos; SKIP_INSTALL = YES; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift index 8f9a85b..0c87622 100644 --- a/Source/SocketEngine.swift +++ b/Source/SocketEngine.swift @@ -540,7 +540,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll case .pong: handlePong(with: fixedString) case .open: - handleOpen(openData: fixedString) + handleOpen(openData: String(fixedString.dropFirst())) case .close: handleClose(fixedString) default: