1259 Commits

Author SHA1 Message Date
Nader Toukabri
018c993a9d remove semicolon 2016-10-28 15:09:21 +01:00
Nader Toukabri
ff12285e94 add SocketAckEmitter.isRequired() 2016-10-28 14:23:22 +01:00
Nader Toukabri
51b95f9cee Merge pull request #1 from socketio/master
sync
2016-10-28 12:56:33 +01:00
Erik Little
86181525df Update README.md 2016-10-27 07:14:53 -04:00
Erik Little
85b6dc1766
bump version v8.1.0 2016-10-27 07:02:01 -04:00
Erik Little
bc7ad37e62
Merge branch 'development'
* development:
  bump websocket version
  bump websocket version
  Fix #521
  add options to objective-c test
  add link to spm example
  remove redundant cast
  remove redundant cast
  Redo emitWithAck API since in Swift 3 parameter names aren't apart of the type
2016-10-27 06:38:56 -04:00
Erik Little
8042053331
bump websocket version 2016-10-27 06:37:39 -04:00
Erik Little
3e3ba60165
bump websocket version 2016-10-12 11:55:44 -04:00
Erik Little
bd5c852fb6 Update README.md 2016-10-05 08:56:22 -04:00
Erik
a32f2d34f0
Fix #521 2016-10-01 10:20:13 -04:00
Erik
fee53e0ccf
add options to objective-c test 2016-09-26 20:39:38 -04:00
Erik
2eb58fb262
add link to spm example 2016-09-25 14:51:54 -04:00
Erik
9ac6af95e3
Merge branch 'master' into development
* master:
  bump version
2016-09-25 13:39:14 -04:00
Erik
b3da89d61c
remove redundant cast 2016-09-25 12:10:29 -04:00
Erik
c91a79fe5b
remove redundant cast 2016-09-25 12:07:55 -04:00
Erik
6771f59ab7
Redo emitWithAck API since in Swift 3 parameter names aren't apart of the type 2016-09-25 11:59:10 -04:00
Erik
2faa2aeb95
bump version v8.0.2 2016-09-20 17:03:41 -04:00
Erik
04011a0a19
Merge branch 'development'
* development:
  fix objective-c
2016-09-20 17:01:41 -04:00
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