Commit Graph

180 Commits

Author SHA1 Message Date
Erik 404fa8cdfa
Merge branch 'development' into swift2.3
* development:
  change spm name
  Modify mac version base mac os 10.9
  Fix cocoapods name
  fix sid bug
  Fix socketio/socket.io-client-swift#472
  bump version
  Refactor engine. Fix infinite recursion in configuration
  Don't send whole packet to handleConnect
  Update readme
  bump version
  update readme
  Renamed modules to make then consistent.
  rename engine init
  Revert "travis plz"
  travis plz
2016-09-02 17:40:58 -04:00
Erik cf12865aa0
fix sid bug 2016-08-29 05:10:03 -04:00
Erik 2200972f4d
Fix socketio/socket.io-client-swift#472 2016-08-28 08:29:00 -04:00
Erik bd7f94333d
Refactor engine. Fix infinite recursion in configuration 2016-08-27 13:05:22 -04:00
Erik 4de7a48e87
Don't send whole packet to handleConnect 2016-08-27 11:37:13 -04:00
Erik 07f2ca5f16
rename engine init 2016-08-14 11:06:55 -04:00
Erik e3c6993f75
merge development 2016-08-14 10:39:13 -04:00
Erik c364f6a832
tweaks 2016-08-14 09:58:21 -04:00
Erik e2bf84f576
Add SocketIOClientConfiguration 2016-08-13 14:55:33 -04:00
Erik a0c6b8b622
Merge develop 2016-08-11 21:38:57 -04:00
Erik 437c983533
Rename variable 2016-08-11 21:26:01 -04:00
Erik 14b4df3836
refactor some reconnect code 2016-08-11 21:11:28 -04:00
Erik b6cb0b2c7b
bump websocket version 2016-08-08 18:24:42 -04:00
Erik 3ec1b93f8e
move extensions 2016-08-02 20:35:41 -04:00
Erik ee63c4e386
refactor out checking for base64 2016-08-02 20:14:04 -04:00
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 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 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 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 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 7fb2193032
fix swiftpm 2016-07-20 11:22:05 -04:00
Erik Little e56741b669
rename variable 2016-07-19 15:03:03 -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 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 2e5442d386 unknown message isn't fatal 2016-06-24 02:35:18 -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 6fd3294fba Revert "swift 2.3"
This reverts commit bfa163f3c2.
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 e163598ee6 add option for sslsecurity 2016-06-14 16:11:37 -04:00
David Beck 0e38039a0c Updated code to support Swift 2.3 2016-06-14 07:31:15 -07:00
Erik 2c059e1a6e log server 2016-06-14 09:38:35 -04:00
Erik 6f21059ff8 work on experimental manager 2016-06-11 12:38:35 -04:00
Erik 58a5a17464 Move websocket to subfolder, don't combine websocket files 2016-06-09 09:28:40 -04:00
Erik cb0a6f5460 rename method 2016-06-07 13:20:23 -04:00
Erik b919d3e411 hopefully fix socket.io/socket.io-client-swift#374 2016-06-07 13:12:34 -04:00