From 30ba41b7b14749e16184016d9110ab9ea2467e02 Mon Sep 17 00:00:00 2001 From: Bill Abt Date: Wed, 22 Jun 2016 14:40:18 -0400 Subject: [PATCH] Updates for the new swift-DEVELOPMENT-SNAPSHOT-2016-06-20-a builds. --- Package.swift | 2 +- README.md | 10 ++++------ Sources/SSLService.swift | 10 +++++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Package.swift b/Package.swift index 1b2d6b7..2438feb 100644 --- a/Package.swift +++ b/Package.swift @@ -36,7 +36,7 @@ let package = Package( targets: [Target(name: "SSLService")], dependencies: [ .Package(url: url, majorVersion: majorVersion, minor: minorVersion), - .Package(url: "https://github.com/IBM-Swift/BlueSocket.git", majorVersion: 0, minor: 5), + .Package(url: "https://github.com/IBM-Swift/BlueSocket.git", majorVersion: 0, minor: 6), ], exclude: ["SSLService.xcodeproj", "README.md", "Sources/Info.plist"] ) diff --git a/README.md b/README.md index 0ecf8ff..eb7c02a 100644 --- a/README.md +++ b/README.md @@ -10,25 +10,23 @@ SSL Add-on framework for [BlueSocket](https://github.com/IBM-Swift/BlueSocket.gi ## Prerequisites ### Swift -* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a` toolchain *or* -* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a` toolchain *or* -* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a` toolchain (*Recommended*) +* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-06-20-a` toolchain (**Minimum REQUIRED for latest release**) ### OS X * OS X 10.11.0 (*El Capitan*) or higher -* Xcode Version 7.3.1 (7D1012) or higher and one of the above toolchains (*Recommended*) +* Xcode Version 8.0 beta (8S128d) or higher using the above toolchain (*Recommended*) * OpenSSL: openssl-1.0.2g or higher. Available via `brew install openssl`. ### Linux * Ubuntu 15.10 (or 14.04 but only tested on 15.10) -* One of the Swift Open Source toolchains listed above +* The Swift Open Source toolchain listed above * OpenSSL is provided by the distribution ### Package Dependencies -* BlueSocket v0.5.17 or higher +* BlueSocket v0.6.0 or higher * OpenSSL-OSX v0.2.4 or higher for OS X * OpenSSL v0.2.0 or higher for Linux diff --git a/Sources/SSLService.swift b/Sources/SSLService.swift index 78d899b..30849d5 100644 --- a/Sources/SSLService.swift +++ b/Sources/SSLService.swift @@ -439,7 +439,7 @@ public class SSLService : SSLServiceDelegate { // - First the CA... if let caFile = configuration.caCertificateFilePath { - if !NSFileManager.default().fileExists(atPath: caFile) { + if !FileManager.default().fileExists(atPath: caFile) { throw SSLError.fail(Int(ENOENT), "CA Certificate doesn't exist in current directory.") } @@ -448,7 +448,7 @@ public class SSLService : SSLServiceDelegate { if let caPath = configuration.caCertificateDirPath { var isDir: ObjCBool = false - if !NSFileManager.default().fileExists(atPath: caPath, isDirectory: &isDir) { + if !FileManager.default().fileExists(atPath: caPath, isDirectory: &isDir) { throw SSLError.fail(Int(ENOENT), "CA Certificate directory path doesn't exist.") } @@ -461,7 +461,7 @@ public class SSLService : SSLServiceDelegate { // - Then the certificate file... if let certFilePath = configuration.certificateFilePath { - if !NSFileManager.default().fileExists(atPath: certFilePath) { + if !FileManager.default().fileExists(atPath: certFilePath) { throw SSLError.fail(Int(ENOENT), "Certificate doesn't exist at specified path.") } @@ -470,7 +470,7 @@ public class SSLService : SSLServiceDelegate { // - Now the key file... if let keyFilePath = configuration.keyFilePath { - if !NSFileManager.default().fileExists(atPath: keyFilePath) { + if !FileManager.default().fileExists(atPath: keyFilePath) { throw SSLError.fail(Int(ENOENT), "Key file doesn't exist at specified path.") } @@ -479,7 +479,7 @@ public class SSLService : SSLServiceDelegate { // - Finally, if present, the certificate chain path... if let chainPath = configuration.certificateChainFilePath { - if !NSFileManager.default().fileExists(atPath: chainPath) { + if !FileManager.default().fileExists(atPath: chainPath) { throw SSLError.fail(Int(ENOENT), "Certificate chain doesn't exist at specified path.") }