Commit Graph

14 Commits

Author SHA1 Message Date
David Beck bc929b7c26 Merge branch 'swift3' of github.com:socketio/socket.io-client-swift into swift3
# Conflicts:
#	Source/SocketTypes.swift
2016-09-07 14:21:10 -07:00
David Beck ffcf5fbf92 Update for Xcode 8 GM 2016-09-07 14:19:53 -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 3bf7a09f98
Swift 3 beta6. Doesn't work, something in websocket.swift is segfaulting the compiler 2016-08-15 18:52:25 -04:00
Erik f6dc11650d merge development 2016-07-14 19:36:48 -04:00
Erik 8345eae28c don't stall queues 2016-07-14 19:25:48 -04:00
Erik e8219e6b6a merge development 2016-07-14 19:12:03 -04:00
Erik 9cc60ab63d hopefully fix race condition in acks 2016-07-14 18:57:27 -04:00
Erik 36aa57e89c beta2 2016-07-06 11:47:25 -04:00
Erik 22030e1153 refactors 2016-07-06 11:19:18 -04:00
Erik 9a4ec5a82a xcode 8 2016-06-14 20:41:59 -04:00
Erik e2db1a086d update for latest swift 3 2016-04-16 12:00:21 -04:00
Erik d4c01183ab style 2016-03-25 09:48:04 -04:00
Erik e2f89d82e4 rename source directory 2015-12-03 14:25:23 -05:00