Commit Graph

1225 Commits

Author SHA1 Message Date
Erik fa4346cbc8
remove testing of test branch 2016-09-10 08:27:44 -04:00
Erik 9d0c03be10
Use xcodebuild until xctool is updated 2016-09-10 08:26:10 -04:00
Erik Little db999a58f2
travis supports the gm 2016-09-08 13:13:24 -04:00
Erik Little a137686163
update readme 2016-09-08 07:33:17 -04:00
Erik Little 6016129562
Turn off travis until it's updated 2016-09-08 07:31:17 -04:00
Erik Little a55e9ab3ba
Merge branch 'development' into swift3
* development:
  Don't parse twice for errors
  use guarded try
  change spm name
  Modify mac version base mac os 10.9
2016-09-08 07:30:28 -04:00
Erik Little c5fd1c71be
Merge branch 'parse-data-subrange' of https://github.com/CFKevinRef/socket.io-client-swift into swift3
* 'parse-data-subrange' of https://github.com/CFKevinRef/socket.io-client-swift:
  Fix truncation of binary data, use range operator for clarity
2016-09-08 07:23:20 -04:00
Erik Little 34ef8a5278
Fix tests 2016-09-08 07:23:00 -04:00
Kevin Cassidy Jr d808d8f157 Fix truncation of binary data, use range operator for clarity 2016-09-07 20:19:55 -07: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 16eefa4abf
Don't parse twice for errors 2016-09-02 18:03:15 -04:00
Erik 49dfd7432c
use guarded try 2016-09-02 17:57:26 -04:00
Erik 923103dec8
change spm name 2016-09-02 17:33:12 -04:00
Erik Little 81a82aae64 Merge pull request #479 from KobeStronger/feature/macVersion
Modify mac version base mac os 10.9
2016-09-02 09:06:06 -04:00
Kobe d3500d38ba Modify mac version base mac os 10.9 2016-09-02 10:46:39 +08: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