cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
* development:
  bump version
  bump travis xcode version
  Fixed endless reconnection loop
This commit is contained in:
Erik Little 2019-10-17 06:32:23 -04:00
commit 36db2ff0eb
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
# v15.2.0
- Small fixes.
# v15.1.0 # v15.1.0
- Add ability to enable websockets SOCKS proxy. - Add ability to enable websockets SOCKS proxy.

4
README.md
View File

@ -99,7 +99,7 @@ Then import `import SocketIO`.
### Carthage ### Carthage
Add this line to your `Cartfile`: 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`. Run `carthage update --platform ios,macosx`.
@ -113,7 +113,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
use_frameworks! use_frameworks!
target 'YourApp' do target 'YourApp' do
pod 'Socket.IO-Client-Swift', '~> 15.1.0' pod 'Socket.IO-Client-Swift', '~> 15.2.0'
end end
``` ```

4
Socket.IO-Client-Swift.podspec
View File

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

2
Source/SocketIO/Engine/SocketEngine.swift
View File

@ -227,7 +227,7 @@ open class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePollable, So
if connected { if connected {
DefaultSocketLogger.Logger.error("Engine tried opening while connected. Assuming this was a reconnect", DefaultSocketLogger.Logger.error("Engine tried opening while connected. Assuming this was a reconnect",
type: SocketEngine.logType) type: SocketEngine.logType)
disconnect(reason: "reconnect") _disconnect(reason: "reconnect")
} }
DefaultSocketLogger.Logger.log("Starting engine. Server: \(url)", type: SocketEngine.logType) DefaultSocketLogger.Logger.log("Starting engine. Server: \(url)", type: SocketEngine.logType)