From 2b6b001c0c7d0c956ba36ec8e0e93859081b468b Mon Sep 17 00:00:00 2001 From: Erik Little Date: Sun, 6 Aug 2017 09:40:52 -0400 Subject: [PATCH 1/2] Bump socket.io dep --- README.md | 8 ++++---- Socket.IO-Client-Swift.podspec | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ddbbbfd..e0c3e06 100644 --- a/README.md +++ b/README.md @@ -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`. diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec index 248ef68..ef8ccf7 100644 --- a/Socket.IO-Client-Swift.podspec +++ b/Socket.IO-Client-Swift.podspec @@ -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 From 38a1187cb79275eee73091da7086009a78553559 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Sun, 6 Aug 2017 09:49:15 -0400 Subject: [PATCH 2/2] Add test for SSLSecurity; bump starscream --- SocketIO-MacTests/SocketObjectiveCTest.m | 10 ++++++++-- Source/Starscream | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/SocketIO-MacTests/SocketObjectiveCTest.m b/SocketIO-MacTests/SocketObjectiveCTest.m index 46848c6..fb4fed3 100644 --- a/SocketIO-MacTests/SocketObjectiveCTest.m +++ b/SocketIO-MacTests/SocketObjectiveCTest.m @@ -11,6 +11,7 @@ @import Foundation; @import XCTest; @import SocketIO; +@import StarscreamSocketIO; @interface SocketObjectiveCTest : XCTestCase @@ -28,7 +29,7 @@ - (void)testProperties { NSURL* url = nil; - + url = self.socket.socketURL; self.socket.forceNew = false; self.socket.handleQueue = dispatch_get_main_queue(); @@ -67,7 +68,7 @@ [self.socket onAny:^(SocketAnyEvent* any) { NSString* event = any.event; NSArray* data = any.items; - + [self.socket emit:event with:data]; }]; } @@ -98,4 +99,9 @@ [manager removeSocketWithLabel:@"test"]; } +- (void)testSSLSecurity { + SSLSecurity* sec = [[SSLSecurity alloc] initWithUsePublicKeys:0]; + sec.isReady = 0; +} + @end diff --git a/Source/Starscream b/Source/Starscream index 13fc473..53003d3 160000 --- a/Source/Starscream +++ b/Source/Starscream @@ -1 +1 @@ -Subproject commit 13fc4730f36c645bd63ea28857df6a510181e0ea +Subproject commit 53003d342e17c8cdf54924adfb8a18a056a58c3d