diff --git a/.travis.yml b/.travis.yml index 3db382d9..ff931c35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: xcode10.2 +osx_image: xcode11.2 branches: only: - master diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f57fc0e..494754d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v15.2.0 + +- Small fixes. + # v15.1.0 - Add ability to enable websockets SOCKS proxy. diff --git a/README.md b/README.md index dd1004ca..855ff67d 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ Then import `import SocketIO`. ### Carthage Add this line to your `Cartfile`: ``` -github "socketio/socket.io-client-swift" ~> 15.1.0 +github "socketio/socket.io-client-swift" ~> 15.2.0 ``` Run `carthage update --platform ios,macosx`. @@ -113,7 +113,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`: use_frameworks! target 'YourApp' do - pod 'Socket.IO-Client-Swift', '~> 15.1.0' + pod 'Socket.IO-Client-Swift', '~> 15.2.0' end ``` diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec index 8abbdb51..e9c9c8c0 100644 --- a/Socket.IO-Client-Swift.podspec +++ b/Socket.IO-Client-Swift.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "Socket.IO-Client-Swift" s.module_name = "SocketIO" - s.version = "15.1.0" + s.version = "15.2.0" 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 => 'v15.1.0', + :tag => 'v15.2.0', :submodules => true } diff --git a/Source/SocketIO/Engine/SocketEngine.swift b/Source/SocketIO/Engine/SocketEngine.swift index 40ae0a8a..a22965f8 100644 --- a/Source/SocketIO/Engine/SocketEngine.swift +++ b/Source/SocketIO/Engine/SocketEngine.swift @@ -227,7 +227,7 @@ open class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePollable, So if connected { DefaultSocketLogger.Logger.error("Engine tried opening while connected. Assuming this was a reconnect", type: SocketEngine.logType) - disconnect(reason: "reconnect") + _disconnect(reason: "reconnect") } DefaultSocketLogger.Logger.log("Starting engine. Server: \(url)", type: SocketEngine.logType)