From 0143dc25bfe1231e97e6ed01c40697b7f4f4bf31 Mon Sep 17 00:00:00 2001 From: Jin Sun Date: Tue, 18 Oct 2016 17:29:01 +0800 Subject: [PATCH 1/5] fix Use Legacy Swift issue --- Socket.IO-Client-Swift.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec index 726d3ac..f44e315 100644 --- a/Socket.IO-Client-Swift.podspec +++ b/Socket.IO-Client-Swift.podspec @@ -17,5 +17,6 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v8.0.2' } s.source_files = "Source/**/*.swift" s.requires_arc = true + s.pod_target_xcconfig = {'SWIFT_VERSION' => '3.0'} # s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files end From ff12285e94ddc358c74b0ddd7191a8aa7bfba9f9 Mon Sep 17 00:00:00 2001 From: Nader Toukabri Date: Fri, 28 Oct 2016 14:23:22 +0100 Subject: [PATCH 2/5] add SocketAckEmitter.isRequired() --- Source/SocketAckEmitter.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/SocketAckEmitter.swift b/Source/SocketAckEmitter.swift index 6b86460..07fd239 100644 --- a/Source/SocketAckEmitter.swift +++ b/Source/SocketAckEmitter.swift @@ -44,6 +44,10 @@ public final class SocketAckEmitter : NSObject { socket.emitAck(ackNum, with: items) } + + public func isRequired() -> Bool { + return ackNum != -1; + } } public final class OnAckCallback : NSObject { From 018c993a9d794d6702980ef7751d33e10167b12f Mon Sep 17 00:00:00 2001 From: Nader Toukabri Date: Fri, 28 Oct 2016 15:09:21 +0100 Subject: [PATCH 3/5] remove semicolon --- Source/SocketAckEmitter.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/SocketAckEmitter.swift b/Source/SocketAckEmitter.swift index 07fd239..2132ad6 100644 --- a/Source/SocketAckEmitter.swift +++ b/Source/SocketAckEmitter.swift @@ -46,7 +46,7 @@ public final class SocketAckEmitter : NSObject { } public func isRequired() -> Bool { - return ackNum != -1; + return ackNum != -1 } } From efad448fab09570bcb4e79255ac171b249717000 Mon Sep 17 00:00:00 2001 From: Nader Toukabri Date: Fri, 28 Oct 2016 15:14:07 +0100 Subject: [PATCH 4/5] change isRequired() to isExpected() --- Source/SocketAckEmitter.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/SocketAckEmitter.swift b/Source/SocketAckEmitter.swift index 2132ad6..b4ae0b9 100644 --- a/Source/SocketAckEmitter.swift +++ b/Source/SocketAckEmitter.swift @@ -45,7 +45,7 @@ public final class SocketAckEmitter : NSObject { socket.emitAck(ackNum, with: items) } - public func isRequired() -> Bool { + public func isExpected() -> Bool { return ackNum != -1 } } From ea3fca376772ae4308eb2b2481f4e1937d84336f Mon Sep 17 00:00:00 2001 From: Nader Toukabri Date: Fri, 28 Oct 2016 15:59:50 +0100 Subject: [PATCH 5/5] SocketAckEmitter.isExpected => .expected --- Source/SocketAckEmitter.swift | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/SocketAckEmitter.swift b/Source/SocketAckEmitter.swift index b4ae0b9..4af43e7 100644 --- a/Source/SocketAckEmitter.swift +++ b/Source/SocketAckEmitter.swift @@ -27,6 +27,10 @@ import Foundation public final class SocketAckEmitter : NSObject { let socket: SocketIOClient let ackNum: Int + + public var expected: Bool { + return ackNum != -1 + } init(socket: SocketIOClient, ackNum: Int) { self.socket = socket @@ -45,9 +49,6 @@ public final class SocketAckEmitter : NSObject { socket.emitAck(ackNum, with: items) } - public func isExpected() -> Bool { - return ackNum != -1 - } } public final class OnAckCallback : NSObject {