Skip to content

Commit 8408922

Browse files
committed
Merge branch 'development'
* development: bump version Set reconnectAttempts in manager. Fixes #989
2 parents 731aaf4 + 47bcfb1 commit 8408922

File tree

6 files changed

+23
-14
lines changed

6 files changed

+23
-14
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: objective-c
22
xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
33
xcode_scheme: SocketIO-Mac
4-
osx_image: xcode9
4+
osx_image: xcode9.2
55
branches:
66
only:
77
- master

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# v13.1.3
2+
3+
- Fix setting reconnectAttempts [#989]((https://github.com/socketio/socket.io-client-swift/issues/989))
4+
5+
16
# v13.1.2
27

38
- 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
2934
What's new:
3035
---
3136

32-
- Adds a new `SocketManager` class that multiplexes multiple namespaces through a single engine.
37+
- Adds a new `SocketManager` class that multiplexes multiple namespaces through a single engine.
3338
- Adds `.sentPing` and `.gotPong` client events for tracking ping/pongs.
3439
- watchOS support.
3540

Package.resolved

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Socket.IO-Client-Swift.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "Socket.IO-Client-Swift"
33
s.module_name = "SocketIO"
4-
s.version = "13.1.2"
4+
s.version = "13.1.3"
55
s.summary = "Socket.IO-client for iOS and OS X"
66
s.description = <<-DESC
77
Socket.IO-client for iOS and OS X.
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
1818
s.requires_arc = true
1919
s.source = {
2020
:git => "https://github.com/socketio/socket.io-client-swift.git",
21-
:tag => 'v13.1.2',
21+
:tag => 'v13.1.3',
2222
:submodules => true
2323
}
2424
s.pod_target_xcconfig = {

Source/SocketIO/Manager/SocketManager.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,8 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa
476476
self.handleQueue = queue
477477
case let .reconnects(reconnects):
478478
self.reconnects = reconnects
479+
case let .reconnectAttempts(attempts):
480+
self.reconnectAttempts = attempts
479481
case let .reconnectWait(wait):
480482
reconnectWait = abs(wait)
481483
case let .log(log):

Tests/TestSocketIO/SocketMangerTest.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,15 @@ class SocketMangerTest : XCTestCase {
7979
.handleQueue(queue),
8080
.forceNew(true),
8181
.reconnects(false),
82-
.reconnectWait(5)
82+
.reconnectWait(5),
83+
.reconnectAttempts(5)
8384
])
8485

8586
XCTAssertEqual(manager.handleQueue, queue)
8687
XCTAssertTrue(manager.forceNew)
8788
XCTAssertFalse(manager.reconnects)
8889
XCTAssertEqual(manager.reconnectWait, 5)
90+
XCTAssertEqual(manager.reconnectAttempts, 5)
8991
}
9092

9193
func testManagerRemovesSocket() {

0 commit comments

Comments
 (0)