11 Commits

Author SHA1 Message Date
David Beck
59c158119a Merge branch 'swift3' of github.com:socketio/socket.io-client-swift into swift3
# Conflicts:
#	SocketIO-MacTests/SocketBasicPacketTest.swift
#	SocketIO-MacTests/SocketNamespacePacketTest.swift
#	Source/SocketExtensions.swift
#	Source/SocketPacket.swift
#	Source/WebSocket.swift
2016-08-23 10:53:50 -07:00
David Beck
536367392f Switch to using Any instead of AnyObject
In Swift 3 AnyObject is rarely what you want to use. Objective-C API gets imported as Any and while types like Array and Dictionary can be coerced to AnyObject, they prefer Any, which doesn’t require a manual cast.
2016-08-23 10:10:33 -07:00
Erik
9acae3b154
I'm not convinced this is right 2016-08-18 19:09:26 -04:00
Erik
0233f383bb
Fix tests, this is broken for obvious reasons 2016-08-15 19:24:10 -04:00
Erik
9a4ec5a82a xcode 8 2016-06-14 20:41:59 -04:00
Erik
f90ad8caeb update for latest swift 2016-05-21 11:45:35 -04:00
Erik
e2db1a086d update for latest swift 3 2016-04-16 12:00:21 -04:00
Erik
376e31bfca merge development and fix tests 2016-04-10 14:15:35 -04:00
Erik
de3ca964ab work on standardizing module name 2016-01-14 16:01:46 -05:00
Erik
1aacab2567 use testable 2015-12-25 10:22:59 -05:00
Erik
a88a859750 rename socketnamespaceemittest 2015-10-11 12:08:17 -04:00