Skip to content

Commit 32ba61f

Browse files
committed
Merge branch 'drekka-development' into development
* drekka-development: make nonobjc More privatisation Making publicKeyChainForTrust() private. api extensions doesn't seem to fail for me update readme
2 parents af77e98 + a9aa28a commit 32ba61f

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,16 @@ github "socketio/socket.io-client-swift" ~> 6.1.5 # Or latest version
9393

9494
Run `carthage update --platform ios,macosx`.
9595

96-
CocoaPods 0.36.0 or later (iOS 8+)
96+
CocoaPods 1.0.0 or later
9797
------------------
9898
Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
9999

100100
```ruby
101-
source 'https://github.com/CocoaPods/Specs.git'
102-
platform :ios, '8.0'
103101
use_frameworks!
104102

105-
pod 'Socket.IO-Client-Swift', '~> 6.1.5' # Or latest version
103+
target 'YourApp' do
104+
pod 'Socket.IO-Client-Swift', '~> 6.1.5' # Or latest version
105+
end
106106
```
107107

108108
Install pods:
@@ -121,7 +121,7 @@ import SocketIOClientSwift
121121
Objective-C:
122122

123123
```Objective-C
124-
#import <SocketIOClientSwift/SocketIOClientSwift-Swift.h>
124+
@import SocketIOClientSwift;
125125
```
126126

127127
CocoaSeeds

Socket.IO-Client-Swift.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,7 @@
814814
isa = XCBuildConfiguration;
815815
buildSettings = {
816816
ALWAYS_SEARCH_USER_PATHS = NO;
817+
APPLICATION_EXTENSION_API_ONLY = YES;
817818
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
818819
CLANG_CXX_LIBRARY = "libc++";
819820
CLANG_ENABLE_MODULES = YES;
@@ -870,6 +871,7 @@
870871
isa = XCBuildConfiguration;
871872
buildSettings = {
872873
ALWAYS_SEARCH_USER_PATHS = NO;
874+
APPLICATION_EXTENSION_API_ONLY = YES;
873875
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
874876
CLANG_CXX_LIBRARY = "libc++";
875877
CLANG_ENABLE_MODULES = YES;

Source/SSLSecurity.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class SSLSecurity : NSObject {
5555

5656
var isReady = false //is the key processing done?
5757
var certificates: [NSData]? //the certificates
58-
var pubKeys: [SecKeyRef]? //the public keys
58+
@nonobjc var pubKeys: [SecKeyRef]? //the public keys
5959
var usePublicKeys = false //use public keys or certificate validation?
6060

6161
/**
@@ -241,7 +241,7 @@ public class SSLSecurity : NSObject {
241241

242242
- returns: the public keys from the certifcate chain for the trust
243243
*/
244-
func publicKeyChainForTrust(trust: SecTrustRef) -> [SecKeyRef] {
244+
@nonobjc func publicKeyChainForTrust(trust: SecTrustRef) -> [SecKeyRef] {
245245
let policy = SecPolicyCreateBasicX509()
246246
let keys = (0..<SecTrustGetCertificateCount(trust)).reduce([SecKeyRef]()) { (keys: [SecKeyRef], index: Int) -> [SecKeyRef] in
247247
var keys = keys

0 commit comments

Comments
 (0)