Skip to content

Commit 36db2ff

Browse files
committed
Merge branch 'development'
* development: bump version bump travis xcode version Fixed endless reconnection loop
2 parents 1a0f6bb + 046bb0e commit 36db2ff

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

.travis.yml

+1-1
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: xcode10.2
4+
osx_image: xcode11.2
55
branches:
66
only:
77
- master

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# v15.2.0
2+
3+
- Small fixes.
4+
15
# v15.1.0
26

37
- Add ability to enable websockets SOCKS proxy.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Then import `import SocketIO`.
9999
### Carthage
100100
Add this line to your `Cartfile`:
101101
```
102-
github "socketio/socket.io-client-swift" ~> 15.1.0
102+
github "socketio/socket.io-client-swift" ~> 15.2.0
103103
```
104104

105105
Run `carthage update --platform ios,macosx`.
@@ -113,7 +113,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
113113
use_frameworks!
114114

115115
target 'YourApp' do
116-
pod 'Socket.IO-Client-Swift', '~> 15.1.0'
116+
pod 'Socket.IO-Client-Swift', '~> 15.2.0'
117117
end
118118
```
119119

Socket.IO-Client-Swift.podspec

+2-2
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 = "15.1.0"
4+
s.version = "15.2.0"
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 => 'v15.1.0',
21+
:tag => 'v15.2.0',
2222
:submodules => true
2323
}
2424

Source/SocketIO/Engine/SocketEngine.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ open class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePollable, So
227227
if connected {
228228
DefaultSocketLogger.Logger.error("Engine tried opening while connected. Assuming this was a reconnect",
229229
type: SocketEngine.logType)
230-
disconnect(reason: "reconnect")
230+
_disconnect(reason: "reconnect")
231231
}
232232

233233
DefaultSocketLogger.Logger.log("Starting engine. Server: \(url)", type: SocketEngine.logType)

0 commit comments

Comments
 (0)