1241 Commits

Author SHA1 Message Date
Erik
8ba3518fbc
fix objective-c 2016-09-20 16:57:09 -04:00
Erik
0849a75686
bump version v8.0.1 2016-09-19 19:02:20 -04:00
Erik
b33e73f119
bump websocket 2016-09-19 19:00:52 -04:00
Erik
549df19d4a
Fix adding / to path 2016-09-19 18:52:13 -04:00
Erik
100a9730d2
rename file v8.0.0 2016-09-14 08:09:14 -04:00
Erik
db35decac9
still try and fix cocoapods 2016-09-14 07:59:19 -04:00
Erik
2810e56162
Try and fix cocoapods 2016-09-14 07:54:55 -04:00
Erik
79e22b7d07
bump version 2016-09-14 07:22:27 -04:00
Erik
83ac8c9ac2
Merge branch 'development'
* development:
  We need to raise target version
2016-09-14 07:21:21 -04:00
Erik
d3de97b584
Merge branch 'development' of https://github.com/socketio/socket.io-client-swift into development
* 'development' of https://github.com/socketio/socket.io-client-swift:
  We need to raise target version
2016-09-14 07:21:07 -04:00
Erik
f051962e81
Merge branch 'development'
* development: (54 commits)
  refactor
  refactors
  clean up some things before xcode8 release
  remove testing of test branch
  Use xcodebuild until xctool is updated
  travis supports the gm
  update readme
  Turn off travis until it's updated
  Fix tests
  Fix truncation of binary data, use range operator for clarity
  Update for Xcode 8 GM
  Don't parse twice for errors
  use guarded try
  change spm name
  Modify mac version base mac os 10.9
  open socket manager
  refactor
  Fix swift3 errors that happened during merge
  Switch to using Any instead of AnyObject
  varios tweaks
  ...
2016-09-14 07:16:37 -04:00
Erik
723129b639
refactor 2016-09-14 07:16:22 -04:00
Erik Little
0183006c00
We need to raise target version 2016-09-12 08:10:12 -04:00
Erik
72b6565510
refactors 2016-09-10 10:12:37 -04:00
Erik
31adcd4728
clean up some things before xcode8 release 2016-09-10 09:17:50 -04:00
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
a412eef268
Merge branch 'development'
* development:
  Fix cocoapods name
v7.0.3
2016-08-29 05:21:55 -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
v7.0.2
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 v7.0.1 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 v7.0.0 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