Erik Little
34ef8a5278
Fix tests
2016-09-08 07:23:00 -04:00
Erik Little
259b453acb
Merge pull request #484 from davbeck/swift3
...
Xcode 8 GM
2016-09-07 17:47:18 -04:00
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
Erik
a950656112
open socket manager
2016-08-31 20:45:15 -04:00
Erik
c7d75b6b83
refactor
2016-08-31 19:58:40 -04:00
Erik
f5cf2b8de5
Fix swift3 errors that happened during merge
2016-08-31 18:19:24 -04:00
Erik
bd192b9af5
merge development
2016-08-31 18:13:31 -04:00
Erik
7d07e55ce5
Fix cocoapods name
2016-08-29 05:21:45 -04:00
Erik
e8c3e22dc6
Merge branch 'development'
...
* development:
fix sid bug
Fix socketio/socket.io-client-swift#472
2016-08-29 05:10:58 -04:00
Erik
cf12865aa0
fix sid bug
2016-08-29 05:10:03 -04:00
Erik
2200972f4d
Fix socketio/socket.io-client-swift#472
2016-08-28 08:29:00 -04:00
Erik
c7c824c3c5
bump version
2016-08-27 13:08:09 -04:00
Erik
89ab458a5f
Merge branch 'development'
...
* development:
Refactor engine. Fix infinite recursion in configuration
Don't send whole packet to handleConnect
2016-08-27 13:07:26 -04:00
Erik
bd7f94333d
Refactor engine. Fix infinite recursion in configuration
2016-08-27 13:05:22 -04:00
Erik
4de7a48e87
Don't send whole packet to handleConnect
2016-08-27 11:37:13 -04:00
Erik
e3c8cc7fd9
Update readme
2016-08-27 11:15:27 -04:00
Erik
4a9013d986
bump version
2016-08-27 11:10:56 -04:00
Erik
2910355245
Merge branch 'development'
...
* development:
update readme
Renamed modules to make then consistent.
rename engine init
tweaks
Add SocketIOClientConfiguration
Rename variable
refactor some reconnect code
bump websocket version
move extensions
refactor out checking for base64
2016-08-27 11:08:30 -04:00
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
5e1dc53304
update readme
2016-08-14 23:05:02 -04:00
Erik Little
e567067d44
Merge pull request #455 from drekka/development
...
Fixing inconsistent module names across iOS & tvOS
2016-08-14 23:03:27 -04:00
Derek Clarkson
518c256cc2
Renamed modules to make then consistent.
...
Remove base sources from test compiles.
2016-08-15 12:18:02 +10:00
Erik
07f2ca5f16
rename engine init
2016-08-14 11:06:55 -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
6147cda561
Merge branch 'development'
...
* development:
bump version
add check for bad paths
Fix socketpollable crashing
make nonobjc
More privatisation
Making publicKeyChainForTrust() private.
api extensions doesn't seem to fail for me
update readme
don't use api extensions only
2016-07-29 19:38:16 -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
