680 Commits

Author SHA1 Message Date
Erik Little
55289d69a3 Update README.md 2015-09-14 13:16:33 -04:00
Erik
5dc0dfa9aa change travis icon to point to master 2015-09-14 13:15:20 -04:00
Erik
2e7be97a38 bump version v3.0.0 2015-09-14 13:12:19 -04:00
Erik
60e0142955 further tweaks to stringreader 2015-09-13 14:05:10 -04:00
Erik
e84acb1471 only need to get the substring once 2015-09-13 13:56:51 -04:00
Erik
8044d6fc1c don't need to call predacessor 2015-09-13 13:46:36 -04:00
Erik
e3ff1f434b add license 2015-09-13 13:39:51 -04:00
Erik
ca67e9e47e use pure swift 2015-09-13 13:37:43 -04:00
Erik
108aa4b08a remove old debug print 2015-09-13 08:20:52 -04:00
Erik
f5f2a15133 tweaks to string reading 2015-09-12 21:26:09 -04:00
Erik Little
ec76704631 Merge pull request #175 from socketio/engine-polling-refactor
Refactor engine polling. Change SocketGenericParser to SocketStringRe…
2015-09-12 18:05:42 -04:00
Erik
2e9232365d remove unused property 2015-09-12 17:14:30 -04:00
Erik
a91fc638f2 remove old log message 2015-09-12 17:12:12 -04:00
Erik
e634b131fb Merge branch 'swift-2' of https://github.com/socketio/socket.io-client-swift into engine-polling-refactor
* 'swift-2' of https://github.com/socketio/socket.io-client-swift:
  replay xctool with xcodebuild
2015-09-12 17:08:05 -04:00
Erik
0e0d47b6ed Refactor engine polling. Change SocketGenericParser to SocketStringReader 2015-09-12 17:04:34 -04:00
Erik Little
4009e577b7 Merge pull request #174 from lightsprint09/fix-travis-xctool
replay xctool with xcodebuild
2015-09-12 13:11:04 -04:00
Lukas Schmidt
bee997aff4 replay xctool with xcodebuild
xcodebuild doesn’t format tests as well as xctool but it works at the
moment.

Change back later
2015-09-12 19:04:27 +02:00
Erik Little
f82aafd5c8 Merge pull request #172 from NachoSoto/apple-tv
Added support for tvOS
2015-09-11 21:51:03 -04:00
NachoSoto
07f9d4f548 Added support for tvOS
## Changes:

- Duplicated target for both framework and tests.
- Set the right platform on new targets.
- Changed `tvOS` framework target product name to `SocketIO`.
- Changed targets `plist`s to use the existing ones, and removed the copies.
- Configured scheme to use the right test target.
- Shared scheme.
- Verified `tvOS` tests pass.
2015-09-12 00:15:07 +00:00
Erik Little
17444dd4a3 Merge pull request #170 from NachoSoto/swift2-comments
Code improvements to Swift 2 branch
2015-09-11 18:46:54 -04:00
NachoSoto
c6997f32dd Fixed indentation 2015-09-11 05:52:17 +00:00
NachoSoto
e955699b21 SSLCert is now private 2015-09-11 05:43:16 +00:00
NachoSoto
2bb7360918 WebSockets: removed unnecessary weaks and simplified code 2015-09-11 05:42:55 +00:00
NachoSoto
d5b9afd28d SwiftRegex does not need to be exposed 2015-09-11 05:39:24 +00:00
NachoSoto
adb3650609 SwiftRegex: failing with fatalError 2015-09-11 05:38:08 +00:00
NachoSoto
dc50af1505 SwiftRegex: changed static method to static to avoid unnecessary dynamic dispatching 2015-09-11 05:37:58 +00:00
NachoSoto
bad0d4b419 SocketPacket: using Logger instead of print 2015-09-11 05:36:05 +00:00
NachoSoto
b8cfdc8fd2 SocketIOClient: simplified conditional 2015-09-11 05:33:40 +00:00
NachoSoto
a43548e203 SocketIOClient: remove unnecessary optional 2015-09-11 05:33:01 +00:00
NachoSoto
2bc72e1975 SocketIOClient: removed unnecessary weak self 2015-09-11 05:31:41 +00:00
NachoSoto
1739afa670 SocketIOClient: added assertion to check timeoutAfter is not negative 2015-09-11 05:28:28 +00:00
NachoSoto
40d76cdbeb SocketIOClient: making a few fields private 2015-09-11 05:26:56 +00:00
NachoSoto
4f2040fbfd Simplified SocketEngine.swift 2015-09-11 05:25:01 +00:00
Erik
d2ae3705ff Merge branch 'swift-2' of https://github.com/socketio/socket.io-client-swift into swift-2
* 'swift-2' of https://github.com/socketio/socket.io-client-swift:
  Use swift 2 guard statement
  Fix use-after-release issue in WebSocket
2015-09-10 16:33:11 -04:00
Erik
a634f5bacc simplify socketengine 2015-09-10 16:32:57 -04:00
Erik Little
259e543ad5 Merge pull request #167 from hankbao/swift-2-fix-use-after-release
Fix use-after-release issue in WebSocket
2015-09-09 11:44:05 -04:00
Hank Bao
713ce46e3b Use swift 2 guard statement 2015-09-09 22:40:09 +08:00
Hank Bao
44508a5193 Fix use-after-release issue in WebSocket 2015-09-09 22:33:35 +08:00
Erik
80cfe8c534 merge master 2015-09-08 09:58:38 -04:00
Erik
8320e296e9 bump version again v2.4.5 2015-09-08 09:30:33 -04:00
Erik
31a2079222 fix warning v2.4.4 2015-09-08 09:22:37 -04:00
Erik
c9d26ebd65 bump version 2015-09-08 09:20:29 -04:00
Erik
77e1da2b51 fix socketio/socket.io-client-swift#166 2015-09-08 09:19:17 -04:00
Erik
8a911a871e Fix socketio/socket.io-client-swift#166 2015-09-08 09:10:37 -04:00
Erik
d8c8b4941e fix case with nsdata in json 2015-09-08 09:00:57 -04:00
Erik
520a765c22 fix file location 2015-09-08 08:36:35 -04:00
Erik
5d9a8e88bf don't need to specifiy get 2015-09-07 17:56:53 -04:00
Erik
ec200e78bb Merge branch 'swift-2' of https://github.com/socketio/socket.io-client-swift into swift-2
* 'swift-2' of https://github.com/socketio/socket.io-client-swift:
  use optionals instead of try/catch
  clean up code style
  disable locale test
  clean up using guard
  fix join namespace parse
  refactor, make use of try catch
  complete use of parser
  using parser for namespace
  use new parser for binary
  clean up code
  refactor clean up code
  socket parser Test
  SocketAckManagerTest
2015-09-07 16:53:14 -04:00
Erik
70b06a2248 small tweak 2015-09-07 16:53:10 -04:00
Erik Little
6cdacefdec Merge pull request #164 from lightsprint09/more-tests
More tests
2015-09-07 16:52:22 -04:00