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

Merge branch 'v11.0.1' into development

Browse Source 
* v11.0.1:
  Add test for SSLSecurity; bump starscream
  Bump socket.io dep
This commit is contained in:
Erik Little 2017-08-06 09:51:51 -04:00
commit 6d21dfdade
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -88,8 +88,8 @@ Then import `import SocketIO`.
### Carthage ### Carthage
Add these line to your `Cartfile`: Add these line to your `Cartfile`:
``` ```
github "nuclearace/Starscream" ~> 8.0.1 github "nuclearace/Starscream" ~> 8.0.2
github "socketio/socket.io-client-swift" ~> 11.0.0 # Or latest version github "socketio/socket.io-client-swift" ~> 11.0.1 # Or latest version
``` ```
Run `carthage update --platform ios,macosx`. Run `carthage update --platform ios,macosx`.
@ -101,7 +101,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', '~> 11.0.0' # Or latest version pod 'Socket.IO-Client-Swift', '~> 11.0.1' # Or latest version
end end
``` ```
@ -129,7 +129,7 @@ Objective-C:
Add this line to your `Seedfile`: 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`. Run `seed install`.

6
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 = "11.0.0" s.version = "11.0.1"
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.
@ -17,9 +17,9 @@ 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 => 'v11.0.0', :tag => 'v11.0.1',
:submodules => true :submodules => true
} }
s.source_files = "Source/*.swift" s.source_files = "Source/*.swift"
s.dependency "StarscreamSocketIO", "~> 8.0.1" s.dependency "StarscreamSocketIO", "~> 8.0.2"
end end

10
SocketIO-MacTests/SocketObjectiveCTest.m
View File

@ -11,6 +11,7 @@
@import Foundation; @import Foundation;
@import XCTest; @import XCTest;
@import SocketIO; @import SocketIO;
@import StarscreamSocketIO;
@interface SocketObjectiveCTest : XCTestCase @interface SocketObjectiveCTest : XCTestCase
@ -28,7 +29,7 @@
- (void)testProperties { - (void)testProperties {
NSURL* url = nil; NSURL* url = nil;
url = self.socket.socketURL; url = self.socket.socketURL;
self.socket.forceNew = false; self.socket.forceNew = false;
self.socket.handleQueue = dispatch_get_main_queue(); self.socket.handleQueue = dispatch_get_main_queue();
@ -67,7 +68,7 @@
[self.socket onAny:^(SocketAnyEvent* any) { [self.socket onAny:^(SocketAnyEvent* any) {
NSString* event = any.event; NSString* event = any.event;
NSArray* data = any.items; NSArray* data = any.items;
[self.socket emit:event with:data]; [self.socket emit:event with:data];
}]; }];
} }
@ -98,4 +99,9 @@
[manager removeSocketWithLabel:@"test"]; [manager removeSocketWithLabel:@"test"];
} }
- (void)testSSLSecurity {
SSLSecurity* sec = [[SSLSecurity alloc] initWithUsePublicKeys:0];
sec.isReady = 0;
}
@end @end

2
Source/Starscream

@ -1 +1 @@
Subproject commit 13fc4730f36c645bd63ea28857df6a510181e0ea Subproject commit 53003d342e17c8cdf54924adfb8a18a056a58c3d