cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into swift-2

Browse Source 
* master:
  maybe fix socketio/socket.io-client-swift#100 and socketio/socket.io-client-swift#22
  Added SocketIOClient.removeAllHandlers
  Updated BuildableName in schemes
  bump version
This commit is contained in:
Erik 2015-07-12 21:11:18 -04:00
commit d073fa8a83
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -61,7 +61,7 @@ Carthage
----------------- -----------------
Add this line to your `Cartfile`: Add this line to your `Cartfile`:
``` ```
github "socketio/socket.io-client-swift" ~> 2.3.7 # Or latest version github "socketio/socket.io-client-swift" ~> 2.3.8 # Or latest version
``` ```
Run `carthage update`. Run `carthage update`.
@ -80,7 +80,7 @@ source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0' platform :ios, '8.0'
use_frameworks! use_frameworks!
pod 'Socket.IO-Client-Swift', '~> 2.3.7' # Or latest version pod 'Socket.IO-Client-Swift', '~> 2.3.8' # Or latest version
``` ```
Install pods: Install pods:

4
Socket.IO-Client-Swift.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "Socket.IO-Client-Swift" s.name = "Socket.IO-Client-Swift"
s.version = "2.3.7" s.version = "2.3.8"
s.summary = "Socket.IO-client for iOS and OS X" s.summary = "Socket.IO-client for iOS and OS X"
s.description = <<-DESC s.description = <<-DESC
Socket.IO-client for iOS and OS X. Socket.IO-client for iOS and OS X.
@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.author = { "Erik" => "nuclear.ace@gmail.com" } s.author = { "Erik" => "nuclear.ace@gmail.com" }
s.ios.deployment_target = '8.0' s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10' s.osx.deployment_target = '10.10'
s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v2.3.7' } s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v2.3.8' }
s.source_files = "SocketIOClientSwift/**/*.swift" s.source_files = "SocketIOClientSwift/**/*.swift"
s.requires_arc = true s.requires_arc = true
# s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files # s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files

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

@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "572EF2371B51F18A00EEBB58" BlueprintIdentifier = "572EF2371B51F18A00EEBB58"
BuildableName = "SocketIO-Mac.framework" BuildableName = "SocketIO.framework"
BlueprintName = "SocketIO-Mac" BlueprintName = "SocketIO-Mac"
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj"> ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
</BuildableReference> </BuildableReference>
@ -57,7 +57,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "572EF2371B51F18A00EEBB58" BlueprintIdentifier = "572EF2371B51F18A00EEBB58"
BuildableName = "SocketIO-Mac.framework" BuildableName = "SocketIO.framework"
BlueprintName = "SocketIO-Mac" BlueprintName = "SocketIO-Mac"
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj"> ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
</BuildableReference> </BuildableReference>
@ -76,7 +76,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "572EF2371B51F18A00EEBB58" BlueprintIdentifier = "572EF2371B51F18A00EEBB58"
BuildableName = "SocketIO-Mac.framework" BuildableName = "SocketIO.framework"
BlueprintName = "SocketIO-Mac" BlueprintName = "SocketIO-Mac"
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj"> ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
</BuildableReference> </BuildableReference>
@ -94,7 +94,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "572EF2371B51F18A00EEBB58" BlueprintIdentifier = "572EF2371B51F18A00EEBB58"
BuildableName = "SocketIO-Mac.framework" BuildableName = "SocketIO.framework"
BlueprintName = "SocketIO-Mac" BlueprintName = "SocketIO-Mac"
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj"> ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
</BuildableReference> </BuildableReference>

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

@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "572EF2181B51F16C00EEBB58" BlueprintIdentifier = "572EF2181B51F16C00EEBB58"
BuildableName = "SocketIO-iOS.framework" BuildableName = "SocketIO.framework"
BlueprintName = "SocketIO-iOS" BlueprintName = "SocketIO-iOS"
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj"> ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
</BuildableReference> </BuildableReference>
@ -57,7 +57,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "572EF2181B51F16C00EEBB58" BlueprintIdentifier = "572EF2181B51F16C00EEBB58"
BuildableName = "SocketIO-iOS.framework" BuildableName = "SocketIO.framework"
BlueprintName = "SocketIO-iOS" BlueprintName = "SocketIO-iOS"
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj"> ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
</BuildableReference> </BuildableReference>
@ -76,7 +76,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "572EF2181B51F16C00EEBB58" BlueprintIdentifier = "572EF2181B51F16C00EEBB58"
BuildableName = "SocketIO-iOS.framework" BuildableName = "SocketIO.framework"
BlueprintName = "SocketIO-iOS" BlueprintName = "SocketIO-iOS"
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj"> ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
</BuildableReference> </BuildableReference>
@ -94,7 +94,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "572EF2181B51F16C00EEBB58" BlueprintIdentifier = "572EF2181B51F16C00EEBB58"
BuildableName = "SocketIO-iOS.framework" BuildableName = "SocketIO.framework"
BlueprintName = "SocketIO-iOS" BlueprintName = "SocketIO-iOS"
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj"> ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
</BuildableReference> </BuildableReference>

8
SocketIOClientSwift/SocketIOClient.swift
View File

@ -432,6 +432,14 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
let handler = SocketEventHandler(event: event, callback: callback) let handler = SocketEventHandler(event: event, callback: callback)
handlers.append(handler) handlers.append(handler)
} }
/**
Removes all handlers.
Can be used after disconnecting to break any potential remaining retain cycles.
*/
public func removeAllHandlers() {
handlers.removeAll(keepCapacity: false)
}
/** /**
Adds a handler that will be called on every event. Adds a handler that will be called on every event.