Merge branch 'development'

* development:
  SocketAckEmitter.isExpected => .expected
  change isRequired() to isExpected()
  remove semicolon
  add SocketAckEmitter.isRequired()
  fix Use Legacy Swift issue
This commit is contained in:
Erik Little 2016-10-28 11:51:58 -04:00
commit 5ed4723535
No known key found for this signature in database
GPG Key ID: BC28525205A08B33
2 changed files with 6 additions and 0 deletions

View File

@ -17,5 +17,6 @@ Pod::Spec.new do |s|
s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v8.1.0' }
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

View File

@ -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
@ -44,6 +48,7 @@ public final class SocketAckEmitter : NSObject {
socket.emitAck(ackNum, with: items)
}
}
public final class OnAckCallback : NSObject {