664 Commits

Author SHA1 Message Date
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
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