1166 Commits

Author SHA1 Message Date
Erik Little
fdb00d63ff
Merge branch 'enhorn-swift2.3' into swift2.3
* enhorn-swift2.3:
  Changes so the legacy build setting is set on the project, instead of each target.
  Adds the legacy option to the build settings, so the project compiles.
swift2.3
2016-09-12 09:30:10 -04:00
Robin Enhorn
a009afc6de Changes so the legacy build setting is set on the project, instead of each target. 2016-09-12 15:23:31 +02:00
Robin Enhorn
c4b1f29c80 Adds the legacy option to the build settings, so the project compiles. 2016-09-12 15:21:23 +02:00
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
923103dec8
change spm name 2016-09-02 17:33:12 -04:00
Erik Little
81a82aae64 Merge pull request #479 from KobeStronger/feature/macVersion
Modify mac version base mac os 10.9
2016-09-02 09:06:06 -04:00
Kobe
d3500d38ba Modify mac version base mac os 10.9 2016-09-02 10:46:39 +08:00
Erik
7d07e55ce5
Fix cocoapods name 2016-08-29 05:21:45 -04:00
Erik
e8c3e22dc6
Merge branch 'development'
* development:
  fix sid bug
  Fix socketio/socket.io-client-swift#472
v7.0.2
2016-08-29 05:10: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
c7c824c3c5
bump version v7.0.1 2016-08-27 13:08:09 -04:00
Erik
89ab458a5f
Merge branch 'development'
* development:
  Refactor engine. Fix infinite recursion in configuration
  Don't send whole packet to handleConnect
2016-08-27 13:07:26 -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
e3c8cc7fd9
Update readme v7.0.0 2016-08-27 11:15:27 -04:00
Erik
4a9013d986
bump version 2016-08-27 11:10:56 -04:00
Erik
2910355245
Merge branch 'development'
* development:
  update readme
  Renamed modules to make then consistent.
  rename engine init
  tweaks
  Add SocketIOClientConfiguration
  Rename variable
  refactor some reconnect code
  bump websocket version
  move extensions
  refactor out checking for base64
2016-08-27 11:08:30 -04:00
Erik
5e1dc53304
update readme 2016-08-14 23:05:02 -04:00
Erik Little
e567067d44 Merge pull request #455 from drekka/development
Fixing inconsistent module names across iOS & tvOS
2016-08-14 23:03:27 -04:00
Derek Clarkson
518c256cc2 Renamed modules to make then consistent.
Remove base sources from test compiles.
2016-08-15 12:18:02 +10: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
6147cda561
Merge branch 'development'
* 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
v6.1.6
2016-07-29 19:38:16 -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
1af7bd842e
Revert "travis plz"
This reverts commit 7bd019fb283e3fd015bff85f451304f2eb3f365d.
2016-07-21 11:15:20 -04:00
Erik Little
7bd019fb28
travis plz 2016-07-21 11:15:07 -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