From 1d56759276f43f7820509c55d3ee870a9ba74f40 Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 24 Jul 2016 09:49:07 -0400 Subject: [PATCH 1/5] update readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 38df018..755caed 100644 --- a/README.md +++ b/README.md @@ -93,16 +93,16 @@ github "socketio/socket.io-client-swift" ~> 6.1.5 # Or latest version Run `carthage update --platform ios,macosx`. -CocoaPods 0.36.0 or later (iOS 8+) +CocoaPods 1.0.0 or later ------------------ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`: ```ruby -source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '8.0' use_frameworks! -pod 'Socket.IO-Client-Swift', '~> 6.1.5' # Or latest version +target 'YourApp' do + pod 'Socket.IO-Client-Swift', '~> 6.1.5' # Or latest version +end ``` Install pods: @@ -121,7 +121,7 @@ import SocketIOClientSwift Objective-C: ```Objective-C -#import +@import SocketIOClientSwift; ``` CocoaSeeds From 10d24c47eccbe905dfc5997d11d75833077b390f Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 24 Jul 2016 09:52:44 -0400 Subject: [PATCH 2/5] api extensions doesn't seem to fail for me --- Socket.IO-Client-Swift.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj index 392f9ea..d005db9 100644 --- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj +++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj @@ -814,6 +814,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -870,6 +871,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; From 21d242ba6ae0560fa4477c04e377dc9b41c362ae Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 25 Jul 2016 13:41:26 +1000 Subject: [PATCH 3/5] Making publicKeyChainForTrust() private. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To Fixing issue when attempting to build for a objective-c project. Exposed API won’t compile so hiding internal method. --- Source/SSLSecurity.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/SSLSecurity.swift b/Source/SSLSecurity.swift index 968e4eb..b3257e4 100644 --- a/Source/SSLSecurity.swift +++ b/Source/SSLSecurity.swift @@ -241,7 +241,7 @@ public class SSLSecurity : NSObject { - returns: the public keys from the certifcate chain for the trust */ - func publicKeyChainForTrust(trust: SecTrustRef) -> [SecKeyRef] { + private func publicKeyChainForTrust(trust: SecTrustRef) -> [SecKeyRef] { let policy = SecPolicyCreateBasicX509() let keys = (0.. [SecKeyRef] in var keys = keys From 99adb49736e36f2a230082ec8da3450875f15c06 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 25 Jul 2016 14:19:10 +1000 Subject: [PATCH 4/5] More privatisation --- Source/SSLSecurity.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/SSLSecurity.swift b/Source/SSLSecurity.swift index b3257e4..454fdc6 100644 --- a/Source/SSLSecurity.swift +++ b/Source/SSLSecurity.swift @@ -55,7 +55,7 @@ public class SSLSecurity : NSObject { var isReady = false //is the key processing done? var certificates: [NSData]? //the certificates - var pubKeys: [SecKeyRef]? //the public keys + private var pubKeys: [SecKeyRef]? //the public keys var usePublicKeys = false //use public keys or certificate validation? /** From a9aa28ae776cf263837a0446ea1946ef430f5b42 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Wed, 27 Jul 2016 11:50:44 -0400 Subject: [PATCH 5/5] make nonobjc --- Source/SSLSecurity.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/SSLSecurity.swift b/Source/SSLSecurity.swift index 454fdc6..4ce1f7a 100644 --- a/Source/SSLSecurity.swift +++ b/Source/SSLSecurity.swift @@ -55,7 +55,7 @@ public class SSLSecurity : NSObject { var isReady = false //is the key processing done? var certificates: [NSData]? //the certificates - private var pubKeys: [SecKeyRef]? //the public keys + @nonobjc var pubKeys: [SecKeyRef]? //the public keys var usePublicKeys = false //use public keys or certificate validation? /** @@ -241,7 +241,7 @@ public class SSLSecurity : NSObject { - returns: the public keys from the certifcate chain for the trust */ - private func publicKeyChainForTrust(trust: SecTrustRef) -> [SecKeyRef] { + @nonobjc func publicKeyChainForTrust(trust: SecTrustRef) -> [SecKeyRef] { let policy = SecPolicyCreateBasicX509() let keys = (0.. [SecKeyRef] in var keys = keys