Erik
23eb9a4dae
Merge branch 'davbeck-swift3-any' into swift3
...
* davbeck-swift3-any:
Switch to using Any instead of AnyObject
2016-08-24 06:54:57 -04:00
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
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
3bf7a09f98
Swift 3 beta6. Doesn't work, something in websocket.swift is segfaulting the compiler
2016-08-15 18:52:25 -04:00
Erik
d2cb8f2d9a
fix conflict
2016-08-14 10:53:16 -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
fcfb409282
bump version
2016-07-29 19:34:22 -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
32ba61fb09
Merge branch 'drekka-development' into development
...
* drekka-development:
make nonobjc
More privatisation
Making publicKeyChainForTrust() private.
api extensions doesn't seem to fail for me
update readme
2016-07-27 11:50:55 -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
10d24c47ec
api extensions doesn't seem to fail for me
2016-07-24 09:52:44 -04:00
Erik
604c30bf28
Merge branch 'development' of https://github.com/socketio/socket.io-client-swift into development
...
* 'development' of https://github.com/socketio/socket.io-client-swift :
don't use api extensions only
don't try and start server
change travis config
remove log for dorequest
2016-07-24 09:50:04 -04:00
Erik
1d56759276
update readme
2016-07-24 09:49:07 -04:00
Erik Little
af77e984ab
don't use api extensions only
2016-07-22 09:13:03 -04:00
Erik Little
bb9ea1849a
Merge branch 'development' into swift3
...
* development:
don't try and start server
2016-07-21 10:52:15 -04:00
Erik Little
cc449a49ea
don't try and start server
2016-07-21 10:49:32 -04:00
Erik Little
4c8bfb91eb
use a whitelist
2016-07-21 10:44:51 -04: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
b65b63a9f0
Merge branch 'master' into development
...
* master:
change travis config
2016-07-21 10:42:30 -04:00
Erik Little
87c86f8aeb
change travis config
2016-07-21 10:42:14 -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
f15a6dc491
bump version
2016-07-20 11:25:45 -04:00
Erik
7fb2193032
fix swiftpm
2016-07-20 11:22:05 -04:00
Erik
8df6eeb85a
Merge branch 'aputinski-swift3' into swift3
...
* aputinski-swift3:
update tests, add test for base64
Fix Xcode 8 Beta 3 issues/warnings
Use Legacy Swift Language Version
Enable APPLICATION_EXTENSION_API_ONLY
2016-07-20 11:08:00 -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
Adam Putinski
f214de1407
Use Legacy Swift Language Version
2016-07-19 22:37:56 -04:00
Erik Little
e56741b669
rename variable
2016-07-19 15:03:03 -04:00
