68 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
b8d6c28ae4
merge development 2016-08-14 10:51:44 -04:00
Erik
c364f6a832
tweaks 2016-08-14 09:58:21 -04:00
Erik
e2bf84f576
Add SocketIOClientConfiguration 2016-08-13 14:55:33 -04:00
Erik
64b9774c83
Move helper method 2016-08-13 13:32:14 -04:00
Erik
4ad3a884a6
merge development 2016-07-20 11:39:37 -04:00
Erik
4ad5025c77
update tests, add test for base64 2016-07-20 11:07:37 -04:00
Erik Little
a9ac86ba3d
fix method call 2016-07-15 10:11:05 -04:00
Erik
f6dc11650d merge development 2016-07-14 19:36:48 -04:00
Erik
e8219e6b6a merge development 2016-07-14 19:12:03 -04:00
Erik
7c3de9f30a even more xcode 8 stuff. style changes 2016-06-15 10:13:44 -04:00
Erik
2adcf2d35d more xcode 8 stuff 2016-06-15 09:32:47 -04:00
Erik
9a4ec5a82a xcode 8 2016-06-14 20:41:59 -04:00
Erik
7500ea83a0 merge development 2016-06-14 19:51:56 -04:00
Erik
d8826a9db3 allow access from objective-c 2016-06-14 16:19:40 -04:00
Erik
6f21059ff8 work on experimental manager 2016-06-11 12:38:35 -04:00
Erik
523ced2f9a merge development 2016-06-09 09:37:26 -04:00
Erik
02f30a81dd fix test 2016-06-06 16:25:37 -04:00
Erik
c6d000972e add test 2016-05-22 14:10:43 -04:00
Erik
f90ad8caeb update for latest swift 2016-05-21 11:45:35 -04:00
Erik
6452f6a97a merge dev 2016-05-05 13:33:52 -04:00
Erik
437c0880e8 don't use placeholder strings for binary 2016-05-05 13:12:05 -04:00
Yannick Loriot
e02ca23d14 Add test case #361 2016-05-04 18:35:56 +02:00
Erik
82e7882497 add rest of emitWithAck for objc test 2016-04-27 18:32:38 -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
ed3d49001f bump websocket version 2016-04-10 13:59:21 -04:00
Erik
2f1f77141e add test for objc api 2016-03-25 10:00:14 -04:00
Erik
6c6b4f32c9 Update for swift 2.2 2016-03-22 09:00:27 -04:00
Erik
6ac96f8d91 modify test 2016-02-16 14:27:18 -05:00
Erik
f7397155b6 add test cases 2016-02-16 14:26:21 -05:00
Erik
b8307b6b27 refactor test 2016-01-29 13:08:41 -05:00
Erik
fe3599d1fe add test for parsing double encoded utf8 2016-01-29 13:06:56 -05:00
Erik
3f57c7e0a9 add default urls 2016-01-25 18:48:21 -05:00
Erik
c9ac69f408 first pass at socketio/socket.io-client-swift#288 2016-01-25 14:55:58 -05:00
Erik
03d5f56114 merge master 2016-01-17 08:48:34 -05:00
Erik
15cfba46bc refactor didError 2016-01-16 15:16:18 -05:00
Erik
dbc8b6fadc refactor engine erroring 2016-01-16 15:04:03 -05:00
Erik
de3ca964ab work on standardizing module name 2016-01-14 16:01:46 -05:00
Erik
fe02b8eff2 change socketparser into a protocol 2016-01-03 13:11:18 -05:00
Erik
1aacab2567 use testable 2015-12-25 10:22:59 -05:00
Erik
a28fda392c move test files 2015-12-25 10:11:00 -05:00
Erik
298817ce5c refactor 2015-12-23 14:00:06 -05:00
Erik
6e5b95be31 fix nuclearace/Socket.IO-Client-Swift#97 2015-12-04 10:03:01 -05:00
Erik
47fd0e386f further decouple engine and client 2015-10-29 18:25:45 -04:00
Erik
9abf2e77e0 use socketioclientoptions for engine 2015-10-21 15:07:00 -04:00
Erik
17fb142083 remove old stuff. change test name 2015-10-15 15:29:03 -04:00