Merge branch 'development'

* development:
  bump version
  Set reconnectAttempts in manager. Fixes #989
This commit is contained in:
Erik Little 2018-03-30 09:51:50 -04:00
commit 840892288b
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320
6 changed files with 23 additions and 14 deletions

View File

@ -1,7 +1,7 @@
language: objective-c
xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
xcode_scheme: SocketIO-Mac
osx_image: xcode9
osx_image: xcode9.2
branches:
only:
- master

View File

@ -1,3 +1,8 @@
# v13.1.3
- Fix setting reconnectAttempts [#989]((https://github.com/socketio/socket.io-client-swift/issues/989))
# v13.1.2
- Fix [#950](https://github.com/socketio/socket.io-client-swift/issues/950)
@ -29,7 +34,7 @@ Checkout out the migration guide in Usage Docs for a more detailed guide on how
What's new:
---
- Adds a new `SocketManager` class that multiplexes multiple namespaces through a single engine.
- Adds a new `SocketManager` class that multiplexes multiple namespaces through a single engine.
- Adds `.sentPing` and `.gotPong` client events for tracking ping/pongs.
- watchOS support.

View File

@ -1,15 +1,6 @@
{
"object": {
"pins": [
{
"package": "SSCZLib",
"repositoryURL": "https://github.com/daltoniam/zlib-spm.git",
"state": {
"branch": null,
"revision": "83ac8d719a2f3aa775dbdf116a57f56fb2c49abb",
"version": "1.1.0"
}
},
{
"package": "SSCommonCrypto",
"repositoryURL": "https://github.com/daltoniam/common-crypto-spm",
@ -27,6 +18,15 @@
"revision": "6cb1c474e09b0a3aa60bcdc7553b570336d6a61a",
"version": "3.0.3"
}
},
{
"package": "SSCZLib",
"repositoryURL": "https://github.com/daltoniam/zlib-spm.git",
"state": {
"branch": null,
"revision": "83ac8d719a2f3aa775dbdf116a57f56fb2c49abb",
"version": "1.1.0"
}
}
]
},

View File

@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "Socket.IO-Client-Swift"
s.module_name = "SocketIO"
s.version = "13.1.2"
s.version = "13.1.3"
s.summary = "Socket.IO-client for iOS and OS X"
s.description = <<-DESC
Socket.IO-client for iOS and OS X.
@ -18,7 +18,7 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.source = {
:git => "https://github.com/socketio/socket.io-client-swift.git",
:tag => 'v13.1.2',
:tag => 'v13.1.3',
:submodules => true
}
s.pod_target_xcconfig = {

View File

@ -476,6 +476,8 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa
self.handleQueue = queue
case let .reconnects(reconnects):
self.reconnects = reconnects
case let .reconnectAttempts(attempts):
self.reconnectAttempts = attempts
case let .reconnectWait(wait):
reconnectWait = abs(wait)
case let .log(log):

View File

@ -79,13 +79,15 @@ class SocketMangerTest : XCTestCase {
.handleQueue(queue),
.forceNew(true),
.reconnects(false),
.reconnectWait(5)
.reconnectWait(5),
.reconnectAttempts(5)
])
XCTAssertEqual(manager.handleQueue, queue)
XCTAssertTrue(manager.forceNew)
XCTAssertFalse(manager.reconnects)
XCTAssertEqual(manager.reconnectWait, 5)
XCTAssertEqual(manager.reconnectAttempts, 5)
}
func testManagerRemovesSocket() {