Skip to content

Commit 6d21dfd

Browse files
committed
Merge branch 'v11.0.1' into development
* v11.0.1: Add test for SSLSecurity; bump starscream Bump socket.io dep
2 parents 00ea70e + 38a1187 commit 6d21dfd

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ Then import `import SocketIO`.
8888
### Carthage
8989
Add these line to your `Cartfile`:
9090
```
91-
github "nuclearace/Starscream" ~> 8.0.1
92-
github "socketio/socket.io-client-swift" ~> 11.0.0 # Or latest version
91+
github "nuclearace/Starscream" ~> 8.0.2
92+
github "socketio/socket.io-client-swift" ~> 11.0.1 # Or latest version
9393
```
9494

9595
Run `carthage update --platform ios,macosx`.
@@ -101,7 +101,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
101101
use_frameworks!
102102

103103
target 'YourApp' do
104-
pod 'Socket.IO-Client-Swift', '~> 11.0.0' # Or latest version
104+
pod 'Socket.IO-Client-Swift', '~> 11.0.1' # Or latest version
105105
end
106106
```
107107

@@ -129,7 +129,7 @@ Objective-C:
129129
Add this line to your `Seedfile`:
130130

131131
```
132-
github "socketio/socket.io-client-swift", "v11.0.0", :files => "Source/*.swift" # Or latest version
132+
github "socketio/socket.io-client-swift", "v11.0.1", :files => "Source/*.swift" # Or latest version
133133
```
134134

135135
Run `seed install`.

Socket.IO-Client-Swift.podspec

Lines changed: 3 additions & 3 deletions
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 = "11.0.0"
4+
s.version = "11.0.1"
55
s.summary = "Socket.IO-client for iOS and OS X"
66
s.description = <<-DESC
77
Socket.IO-client for iOS and OS X.
@@ -17,9 +17,9 @@ Pod::Spec.new do |s|
1717
s.requires_arc = true
1818
s.source = {
1919
:git => "https://github.com/socketio/socket.io-client-swift.git",
20-
:tag => 'v11.0.0',
20+
:tag => 'v11.0.1',
2121
:submodules => true
2222
}
2323
s.source_files = "Source/*.swift"
24-
s.dependency "StarscreamSocketIO", "~> 8.0.1"
24+
s.dependency "StarscreamSocketIO", "~> 8.0.2"
2525
end

SocketIO-MacTests/SocketObjectiveCTest.m

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
@import Foundation;
1212
@import XCTest;
1313
@import SocketIO;
14+
@import StarscreamSocketIO;
1415

1516
@interface SocketObjectiveCTest : XCTestCase
1617

@@ -28,7 +29,7 @@ - (void)setUp {
2829

2930
- (void)testProperties {
3031
NSURL* url = nil;
31-
32+
3233
url = self.socket.socketURL;
3334
self.socket.forceNew = false;
3435
self.socket.handleQueue = dispatch_get_main_queue();
@@ -67,7 +68,7 @@ - (void)testOnAnySyntax {
6768
[self.socket onAny:^(SocketAnyEvent* any) {
6869
NSString* event = any.event;
6970
NSArray* data = any.items;
70-
71+
7172
[self.socket emit:event with:data];
7273
}];
7374
}
@@ -98,4 +99,9 @@ - (void)testSocketManager {
9899
[manager removeSocketWithLabel:@"test"];
99100
}
100101

102+
- (void)testSSLSecurity {
103+
SSLSecurity* sec = [[SSLSecurity alloc] initWithUsePublicKeys:0];
104+
sec.isReady = 0;
105+
}
106+
101107
@end

0 commit comments

Comments
 (0)