Skip to content

Commit 30ba41b

Browse files
author
Bill Abt
committed
Updates for the new swift-DEVELOPMENT-SNAPSHOT-2016-06-20-a builds.
1 parent eef99bc commit 30ba41b

3 files changed

Lines changed: 10 additions & 12 deletions

File tree

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ let package = Package(
3636
targets: [Target(name: "SSLService")],
3737
dependencies: [
3838
.Package(url: url, majorVersion: majorVersion, minor: minorVersion),
39-
.Package(url: "https://github.com/IBM-Swift/BlueSocket.git", majorVersion: 0, minor: 5),
39+
.Package(url: "https://github.com/IBM-Swift/BlueSocket.git", majorVersion: 0, minor: 6),
4040
],
4141
exclude: ["SSLService.xcodeproj", "README.md", "Sources/Info.plist"]
4242
)

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,23 @@ SSL Add-on framework for [BlueSocket](https://github.com/IBM-Swift/BlueSocket.gi
1010
## Prerequisites
1111

1212
### Swift
13-
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a` toolchain *or*
14-
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a` toolchain *or*
15-
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a` toolchain (*Recommended*)
13+
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-06-20-a` toolchain (**Minimum REQUIRED for latest release**)
1614

1715
### OS X
1816

1917
* OS X 10.11.0 (*El Capitan*) or higher
20-
* Xcode Version 7.3.1 (7D1012) or higher and one of the above toolchains (*Recommended*)
18+
* Xcode Version 8.0 beta (8S128d) or higher using the above toolchain (*Recommended*)
2119
* OpenSSL: openssl-1.0.2g or higher. Available via `brew install openssl`.
2220

2321
### Linux
2422

2523
* Ubuntu 15.10 (or 14.04 but only tested on 15.10)
26-
* One of the Swift Open Source toolchains listed above
24+
* The Swift Open Source toolchain listed above
2725
* OpenSSL is provided by the distribution
2826

2927
### Package Dependencies
3028

31-
* BlueSocket v0.5.17 or higher
29+
* BlueSocket v0.6.0 or higher
3230
* OpenSSL-OSX v0.2.4 or higher for OS X
3331
* OpenSSL v0.2.0 or higher for Linux
3432

Sources/SSLService.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ public class SSLService : SSLServiceDelegate {
439439
// - First the CA...
440440
if let caFile = configuration.caCertificateFilePath {
441441

442-
if !NSFileManager.default().fileExists(atPath: caFile) {
442+
if !FileManager.default().fileExists(atPath: caFile) {
443443

444444
throw SSLError.fail(Int(ENOENT), "CA Certificate doesn't exist in current directory.")
445445
}
@@ -448,7 +448,7 @@ public class SSLService : SSLServiceDelegate {
448448
if let caPath = configuration.caCertificateDirPath {
449449

450450
var isDir: ObjCBool = false
451-
if !NSFileManager.default().fileExists(atPath: caPath, isDirectory: &isDir) {
451+
if !FileManager.default().fileExists(atPath: caPath, isDirectory: &isDir) {
452452

453453
throw SSLError.fail(Int(ENOENT), "CA Certificate directory path doesn't exist.")
454454
}
@@ -461,7 +461,7 @@ public class SSLService : SSLServiceDelegate {
461461
// - Then the certificate file...
462462
if let certFilePath = configuration.certificateFilePath {
463463

464-
if !NSFileManager.default().fileExists(atPath: certFilePath) {
464+
if !FileManager.default().fileExists(atPath: certFilePath) {
465465

466466
throw SSLError.fail(Int(ENOENT), "Certificate doesn't exist at specified path.")
467467
}
@@ -470,7 +470,7 @@ public class SSLService : SSLServiceDelegate {
470470
// - Now the key file...
471471
if let keyFilePath = configuration.keyFilePath {
472472

473-
if !NSFileManager.default().fileExists(atPath: keyFilePath) {
473+
if !FileManager.default().fileExists(atPath: keyFilePath) {
474474

475475
throw SSLError.fail(Int(ENOENT), "Key file doesn't exist at specified path.")
476476
}
@@ -479,7 +479,7 @@ public class SSLService : SSLServiceDelegate {
479479
// - Finally, if present, the certificate chain path...
480480
if let chainPath = configuration.certificateChainFilePath {
481481

482-
if !NSFileManager.default().fileExists(atPath: chainPath) {
482+
if !FileManager.default().fileExists(atPath: chainPath) {
483483

484484
throw SSLError.fail(Int(ENOENT), "Certificate chain doesn't exist at specified path.")
485485
}

0 commit comments

Comments
 (0)