Merge branch 'development'
* development: bump version bump travis xcode version Fixed endless reconnection loop
This commit is contained in:
		
						commit
						36db2ff0eb
					
				@ -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
 | 
			
		||||
 | 
			
		||||
@ -1,3 +1,7 @@
 | 
			
		||||
# v15.2.0
 | 
			
		||||
 | 
			
		||||
- Small fixes.
 | 
			
		||||
 | 
			
		||||
# v15.1.0
 | 
			
		||||
 | 
			
		||||
- Add ability to enable websockets SOCKS proxy.
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user