Merge branch 'v11.0.1' into development
* v11.0.1: Add test for SSLSecurity; bump starscream Bump socket.io dep
This commit is contained in:
commit
6d21dfdade
@ -88,8 +88,8 @@ Then import `import SocketIO`.
|
||||
### Carthage
|
||||
Add these line to your `Cartfile`:
|
||||
```
|
||||
github "nuclearace/Starscream" ~> 8.0.1
|
||||
github "socketio/socket.io-client-swift" ~> 11.0.0 # Or latest version
|
||||
github "nuclearace/Starscream" ~> 8.0.2
|
||||
github "socketio/socket.io-client-swift" ~> 11.0.1 # Or latest version
|
||||
```
|
||||
|
||||
Run `carthage update --platform ios,macosx`.
|
||||
@ -101,7 +101,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
|
||||
use_frameworks!
|
||||
|
||||
target 'YourApp' do
|
||||
pod 'Socket.IO-Client-Swift', '~> 11.0.0' # Or latest version
|
||||
pod 'Socket.IO-Client-Swift', '~> 11.0.1' # Or latest version
|
||||
end
|
||||
```
|
||||
|
||||
@ -129,7 +129,7 @@ Objective-C:
|
||||
Add this line to your `Seedfile`:
|
||||
|
||||
```
|
||||
github "socketio/socket.io-client-swift", "v11.0.0", :files => "Source/*.swift" # Or latest version
|
||||
github "socketio/socket.io-client-swift", "v11.0.1", :files => "Source/*.swift" # Or latest version
|
||||
```
|
||||
|
||||
Run `seed install`.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "Socket.IO-Client-Swift"
|
||||
s.module_name = "SocketIO"
|
||||
s.version = "11.0.0"
|
||||
s.version = "11.0.1"
|
||||
s.summary = "Socket.IO-client for iOS and OS X"
|
||||
s.description = <<-DESC
|
||||
Socket.IO-client for iOS and OS X.
|
||||
@ -17,9 +17,9 @@ Pod::Spec.new do |s|
|
||||
s.requires_arc = true
|
||||
s.source = {
|
||||
:git => "https://github.com/socketio/socket.io-client-swift.git",
|
||||
:tag => 'v11.0.0',
|
||||
:tag => 'v11.0.1',
|
||||
:submodules => true
|
||||
}
|
||||
s.source_files = "Source/*.swift"
|
||||
s.dependency "StarscreamSocketIO", "~> 8.0.1"
|
||||
s.dependency "StarscreamSocketIO", "~> 8.0.2"
|
||||
end
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
@import Foundation;
|
||||
@import XCTest;
|
||||
@import SocketIO;
|
||||
@import StarscreamSocketIO;
|
||||
|
||||
@interface SocketObjectiveCTest : XCTestCase
|
||||
|
||||
@ -98,4 +99,9 @@
|
||||
[manager removeSocketWithLabel:@"test"];
|
||||
}
|
||||
|
||||
- (void)testSSLSecurity {
|
||||
SSLSecurity* sec = [[SSLSecurity alloc] initWithUsePublicKeys:0];
|
||||
sec.isReady = 0;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 13fc4730f36c645bd63ea28857df6a510181e0ea
|
||||
Subproject commit 53003d342e17c8cdf54924adfb8a18a056a58c3d
|
||||
Loading…
x
Reference in New Issue
Block a user