Commit Graph

647 Commits

Author SHA1 Message Date
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 2015-09-08 09:30:33 -04:00
Erik 31a2079222 fix warning 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
Lukas Schmidt 222f622d3a use optionals instead of try/catch 2015-09-07 21:29:51 +02:00
Lukas Schmidt 91cc683b5b clean up code style 2015-09-07 20:25:13 +02:00
Lukas Schmidt 12f607e3c3 disable locale test 2015-09-07 19:34:45 +02:00
Lukas Schmidt 568b2ae1bc clean up using guard 2015-09-07 19:28:19 +02:00
Erik c8c67d66a8 typing dictionary might not always be right 2015-09-07 13:26:58 -04:00
Lukas Schmidt 70cacb025f fix join namespace parse 2015-09-07 19:19:22 +02:00
Erik 5fdea20455 simplify socketpacket methods 2015-09-07 13:15:54 -04:00
Lukas Schmidt 2bd612e47a refactor, make use of try catch 2015-09-07 15:08:10 +02:00
Lukas Schmidt fb9b19820b complete use of parser 2015-09-07 14:44:43 +02:00
Lukas Schmidt 8bae7d06d2 using parser for namespace 2015-09-07 13:53:43 +02:00
Lukas Schmidt 0b8be08a54 use new parser for binary 2015-09-07 12:53:28 +02:00
Lukas Schmidt 6f16694ed2 Merge remote-tracking branch 'origin/socketio/swift-2' into more-tests
Conflicts:
	SocketIOClientSwift/SocketParser.swift
2015-09-06 23:49:05 +02:00
Lukas Schmidt 13087ff1b7 clean up code 2015-09-06 23:45:52 +02:00
Erik 648d9d9df0 println doesn't exist anymore 2015-09-06 17:44:41 -04:00
Lukas Schmidt 16ed2bd130 refactor clean up code 2015-09-06 22:45:18 +02:00
Lukas Schmidt de0d0b8676 socket parser Test 2015-09-06 20:04:10 +02:00
Lukas Schmidt e79199d2e6 SocketAckManagerTest 2015-09-05 18:48:56 +02:00
Erik ac023013d4 change logging 2015-09-04 09:41:40 -04:00
Erik Little 0cfdd0b005 Merge pull request #161 from lightsprint09/logger
Logger +  Missing Test code
2015-09-04 09:27:55 -04:00
Lukas Schmidt f32c0850ac missing code 2015-09-04 14:51:08 +02:00
Lukas Schmidt fe7fb3ea4e improve status enum readability 2015-09-04 13:49:56 +02:00
Lukas Schmidt 4de0652568 improve logger api 2015-09-04 13:48:19 +02:00
Lukas Schmidt 6e43e58988 Merge remote-tracking branch 'socketio/swift-2' 2015-09-04 07:50:18 +02:00
Erik d6e1510cbf update websocket library 2015-09-03 23:32:48 -04:00
Erik 13440ce6b1 small tweak 2015-09-03 16:24:05 -04:00
Erik d81cbd7d24 fix unsafeBitCast error 2015-09-03 15:20:15 -04:00
Erik a147ebcd85 Default logging won't use another dispatch queue 2015-09-03 15:14:25 -04:00
Erik 8d0af14f04 add ability to specify custom logger 2015-09-03 15:10:18 -04:00
Erik 0ff4cb9713 remove old check 2015-09-03 12:27:24 -04:00
Erik Little 2ae994a031 Add travis build icon for swift-2 branch 2015-09-03 12:08:42 -04:00
Erik Little 0dc4f863f3 Merge pull request #158 from lightsprint09/fix-travis-ci-tests
Fix travis ci tests
2015-09-03 11:59:08 -04:00
Lukas Schmidt 0fb9be6247 clean debug code 2015-09-03 16:52:43 +02:00
Lukas Schmidt 69b3958796 single connection 2015-09-03 16:47:06 +02:00