1132 Commits

Author SHA1 Message Date
Erik
ea1fc1b0cc
Merge branch 'development' into swift2.3
* development:
  bump version
  add check for bad paths
  Fix socketpollable crashing
  make nonobjc
  More privatisation
  Making publicKeyChainForTrust() private.
  api extensions doesn't seem to fail for me
  update readme
  don't use api extensions only
2016-07-29 19:43:18 -04:00
Erik
fcfb409282
bump version 2016-07-29 19:34:22 -04:00
Erik
d03d77aff8
add check for bad paths 2016-07-28 21:36:37 -04:00
Erik
a74d2fba85
Merge branch 'evanbrass-fix-optional-unwrapping' into swift2.3
* evanbrass-fix-optional-unwrapping:
  Fix errors with force unwrapping optionals
2016-07-28 21:19:47 -04:00
Erik
dbbed11a03
fix warning 2016-07-28 21:19:40 -04:00
Evan Brass
8f0a7c8f82 Fix errors with force unwrapping optionals
- Removing these fixed compile errors on swift 2.3.
2016-07-28 12:23:03 -04:00
Erik
637e0bb14c
Fix socketpollable crashing 2016-07-27 21:16:48 -04:00
Erik Little
32ba61fb09
Merge branch 'drekka-development' into development
* drekka-development:
  make nonobjc
  More privatisation
  Making publicKeyChainForTrust() private.
  api extensions doesn't seem to fail for me
  update readme
2016-07-27 11:50:55 -04:00
Erik Little
a9aa28ae77
make nonobjc 2016-07-27 11:50:44 -04:00
Derek Clarkson
99adb49736 More privatisation 2016-07-25 14:19:10 +10:00
Derek Clarkson
21d242ba6a Making publicKeyChainForTrust() private.
To Fixing issue when attempting to build for a objective-c project. Exposed API won’t compile so hiding internal method.
2016-07-25 13:41:26 +10:00
Erik
10d24c47ec
api extensions doesn't seem to fail for me 2016-07-24 09:52:44 -04:00
Erik
604c30bf28
Merge branch 'development' of https://github.com/socketio/socket.io-client-swift into development
* 'development' of https://github.com/socketio/socket.io-client-swift:
  don't use api extensions only
  don't try and start server
  change travis config
  remove log for dorequest
2016-07-24 09:50:04 -04:00
Erik
1d56759276
update readme 2016-07-24 09:49:07 -04:00
Erik Little
af77e984ab
don't use api extensions only 2016-07-22 09:13:03 -04:00
Erik Little
4d12f9f510
Merge branch 'development' into swift2.3
* development:
  don't try and start server
2016-07-21 10:51:54 -04:00
Erik Little
cc449a49ea
don't try and start server 2016-07-21 10:49:32 -04:00
Erik Little
a2969680e8
Merge branch 'development' into swift2.3
* development:
  change travis config
  remove log for dorequest
2016-07-21 10:47:39 -04:00
Erik Little
b65b63a9f0
Merge branch 'master' into development
* master:
  change travis config
2016-07-21 10:42:30 -04:00
Erik Little
87c86f8aeb
change travis config 2016-07-21 10:42:14 -04:00
Erik Little
c9b60445ca
remove log for dorequest 2016-07-21 10:28:20 -04:00
Erik
744d6bd062
Merge branch 'development' into swift2.3
* development:
  bump version
  fix swiftpm
  rename variable
  Enable APPLICATION_EXTENSION_API_ONLY
  fix method call
  fixes
  don't stall queues
  hopefully fix race condition in acks
  refactors
  Update README.md
  refactors, rename file
  refactoring
  refactor some serialization into methods
2016-07-20 11:32:38 -04:00
Erik
f15a6dc491
bump version v6.1.5 2016-07-20 11:25:45 -04:00
Erik
7fb2193032
fix swiftpm 2016-07-20 11:22:05 -04:00
Erik Little
e56741b669
rename variable 2016-07-19 15:03:03 -04:00
Adam Putinski
559fbc0286
Enable APPLICATION_EXTENSION_API_ONLY 2016-07-19 09:15:28 -04:00
Erik Little
a9ac86ba3d
fix method call 2016-07-15 10:11:05 -04:00
Erik
dce28b2dac fixes 2016-07-14 19:26:56 -04:00
Erik
8345eae28c don't stall queues 2016-07-14 19:25:48 -04:00
Erik
9cc60ab63d hopefully fix race condition in acks 2016-07-14 18:57:27 -04:00
Erik
22030e1153 refactors 2016-07-06 11:19:18 -04:00
Erik
73b042b41e Merge branch 'master' into development
* master:
  Update README.md
2016-07-01 17:06:59 -04:00
Erik Little
f52607f722 Update README.md 2016-07-01 17:06:37 -04:00
Erik
f00ed17783 refactors, rename file 2016-07-01 15:42:13 -04:00
Erik
5840d2b61b refactoring 2016-07-01 15:38:53 -04:00
Erik
17d3e659c1 refactor some serialization into methods 2016-07-01 15:36:06 -04:00
Erik
5814e8d275 Merge branch 'master' into swift2.3
* master:
  unknown message isn't fatal
  bump version
  notify client when engine disconnects
2016-06-24 02:49:14 -04:00
Erik Little
05c0874f32 Merge pull request #408 from socketio/development
Development
v6.1.4
2016-06-24 02:41:22 -04:00
Erik
2e5442d386 unknown message isn't fatal 2016-06-24 02:35:18 -04:00
Erik
f9ae0cfdb3 bump version 2016-06-24 02:22:23 -04:00
Erik
7ad90de184 Merge branch 'master' into development
* master:
  bump version
2016-06-24 02:21:54 -04:00
Erik
4383ddfe65 notify client when engine disconnects 2016-06-24 02:21:25 -04:00
Erik
be76a1607c merge master 2016-06-17 10:16:52 -04:00
Erik
45373ad680 bump version v6.1.3 2016-06-17 10:05:20 -04:00
Erik Little
5ced8a5a9e Merge pull request #399 from socketio/development
Development
2016-06-17 10:03:50 -04:00
Erik Little
c1a451f314 Merge pull request #398 from davbeck/swift2.3
Updated code to support Swift 2.3
2016-06-16 19:07:28 -04:00
Erik
6fd3294fba Revert "swift 2.3"
This reverts commit bfa163f3c2e85776d8bcf0c24eca65b7398f403d.
2016-06-14 19:41:18 -04:00
Erik
bfa163f3c2 swift 2.3 2016-06-14 19:37:27 -04:00
Erik
d8826a9db3 allow access from objective-c 2016-06-14 16:19:40 -04:00
Erik
b9e3de2d50 add documentation 2016-06-14 16:13:01 -04:00