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
f982e756c2
varios tweaks
2016-08-20 17:58:52 -04:00
Erik
29670af4d3
fix crash
2016-08-20 16:16:57 -04:00
Erik
70b870690e
Fix websocket
2016-08-20 15:30:07 -04:00
Erik
1232c34817
narrow down what's causing compiler crashes
2016-08-18 19:34:01 -04:00
Erik
0233f383bb
Fix tests, this is broken for obvious reasons
2016-08-15 19:24:10 -04: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
07f2ca5f16
rename engine init
2016-08-14 11:06:55 -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
ddd7003d89
merge development
2016-08-11 22:08:48 -04:00
Erik
437c983533
Rename variable
2016-08-11 21:26:01 -04:00
Erik
14b4df3836
refactor some reconnect code
2016-08-11 21:11:28 -04:00
Erik
b6cb0b2c7b
bump websocket version
2016-08-08 18:24:42 -04:00
Erik
81dfabbe15
Remove old files
2016-08-08 17:45:10 -04:00
Erik
3ec1b93f8e
move extensions
2016-08-02 20:35:41 -04:00
Erik
ee63c4e386
refactor out checking for base64
2016-08-02 20:14:04 -04:00
Erik
61a20cf27e
update for beta 4
2016-08-02 19:38:08 -04:00
Erik
a5db13c8b5
merge development
2016-07-29 20:06:43 -04:00
Erik
d03d77aff8
add check for bad paths
2016-07-28 21:36:37 -04:00
Erik
637e0bb14c
Fix socketpollable crashing
2016-07-27 21:16:48 -04:00
Erik Little
a9aa28ae77
make nonobjc
2016-07-27 11:50:44 -04:00
Derek Clarkson
99adb49736
More privatisation
2016-07-25 14:19:10 +10:00
Derek Clarkson
21d242ba6a
Making publicKeyChainForTrust() private.
...
To Fixing issue when attempting to build for a objective-c project. Exposed API won’t compile so hiding internal method.
2016-07-25 13:41:26 +10:00
Erik Little
3500211eed
Merge branch 'development' into swift3
...
* development:
change travis config
remove log for dorequest
2016-07-21 10:44:11 -04:00
Erik Little
c9b60445ca
remove log for dorequest
2016-07-21 10:28:20 -04:00
Erik
4ad3a884a6
merge development
2016-07-20 11:39:37 -04:00
Erik
7fb2193032
fix swiftpm
2016-07-20 11:22:05 -04:00
Erik
4ad5025c77
update tests, add test for base64
2016-07-20 11:07:37 -04:00
Adam Putinski
777fa30c76
Fix Xcode 8 Beta 3 issues/warnings
2016-07-19 23:01:59 -04:00
Erik Little
e56741b669
rename variable
2016-07-19 15:03:03 -04:00
Erik
e961e11487
change another method name
2016-07-16 22:27:50 -04:00
Erik
f140d7979e
change method name
2016-07-16 21:27:18 -04:00
Erik
f3d771641d
some swift3 changes
2016-07-14 19:54:09 -04:00
Erik
f6dc11650d
merge development
2016-07-14 19:36:48 -04:00
Erik
dce28b2dac
fixes
2016-07-14 19:26:56 -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
f00ed17783
refactors, rename file
2016-07-01 15:42:13 -04:00
Erik
5840d2b61b
refactoring
2016-07-01 15:38:53 -04:00
Erik
17d3e659c1
refactor some serialization into methods
2016-07-01 15:36:06 -04:00
Erik
c129118496
merge development
2016-06-24 02:53:31 -04:00
Erik
2e5442d386
unknown message isn't fatal
2016-06-24 02:35:18 -04:00
Erik
4383ddfe65
notify client when engine disconnects
2016-06-24 02:21:25 -04:00
