Skip to content

Commit f464082

Browse files
author
Bill Abt
committed
Updated to latest (7/25) toolchain.
1 parent cd93e2a commit f464082

4 files changed

Lines changed: 18 additions & 16 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: 6),
39+
.Package(url: "https://github.com/IBM-Swift/BlueSocket.git", majorVersion: 0, minor: 7),
4040
],
4141
exclude: ["SSLService.xcodeproj", "README.md", "Sources/Info.plist"]
4242
)

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ 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-06-20-a` toolchain (**Minimum REQUIRED for latest release**)
13+
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-07-25-a` toolchain (**Minimum REQUIRED for latest release**)
1414

1515
### macOS
1616

17-
* macOS 10.11.0 (*El Capitan*) or higher
18-
* Xcode Version 8.0 beta (8S128d) or higher using the above toolchain (*Recommended*)
17+
* macOS 10.11.6 (*El Capitan*) or higher
18+
* Xcode Version 8.0 beta 3 (8S174q) or higher using the above toolchain (*Recommended*)
1919
* OpenSSL: openssl-1.0.2g or higher. Available via `brew install openssl`.
2020

2121
### Linux
@@ -26,7 +26,7 @@ SSL Add-on framework for [BlueSocket](https://github.com/IBM-Swift/BlueSocket.gi
2626

2727
### Package Dependencies
2828

29-
* BlueSocket v0.6.0 or higher
29+
* BlueSocket v0.7.0 or higher
3030
* OpenSSL-OSX v0.2.4 or higher for macOS
3131
* OpenSSL v0.2.0 or higher for Linux
3232

SSLService.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,15 @@
288288
isa = XCBuildConfiguration;
289289
baseConfigurationReference = __PBXFileRef_SSLService.xcodeproj/Configs/Project.xcconfig /* Project.xcconfig */;
290290
buildSettings = {
291+
SWIFT_VERSION = 3.0;
291292
};
292293
name = Release;
293294
};
294295
"_______Debug_" /* Debug */ = {
295296
isa = XCBuildConfiguration;
296297
baseConfigurationReference = __PBXFileRef_SSLService.xcodeproj/Configs/Project.xcconfig /* Project.xcconfig */;
297298
buildSettings = {
299+
SWIFT_VERSION = 3.0;
298300
};
299301
name = Debug;
300302
};

Sources/SSLService.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public class SSLService : SSLServiceDelegate {
389389
// - First the CA...
390390
if let caFile = configuration.caCertificateFilePath {
391391

392-
if !NSFileManager.defaultManager().fileExists(atPath: caFile) {
392+
if !FileManager.default().fileExists(atPath: caFile) {
393393

394394
throw SSLError.fail(Int(ENOENT), "CA Certificate doesn't exist in current directory.")
395395
}
@@ -398,7 +398,7 @@ public class SSLService : SSLServiceDelegate {
398398
if let caPath = configuration.caCertificateDirPath {
399399

400400
var isDir: ObjCBool = false
401-
if !NSFileManager.defaultManager().fileExists(atPath: caPath, isDirectory: &isDir) {
401+
if !FileManager.default().fileExists(atPath: caPath, isDirectory: &isDir) {
402402

403403
throw SSLError.fail(Int(ENOENT), "CA Certificate directory path doesn't exist.")
404404
}
@@ -411,7 +411,7 @@ public class SSLService : SSLServiceDelegate {
411411
// - Then the certificate file...
412412
if let certFilePath = configuration.certificateFilePath {
413413

414-
if !NSFileManager.defaultManager().fileExists(atPath: certFilePath) {
414+
if !FileManager.default().fileExists(atPath: certFilePath) {
415415

416416
throw SSLError.fail(Int(ENOENT), "Certificate doesn't exist at specified path.")
417417
}
@@ -420,7 +420,7 @@ public class SSLService : SSLServiceDelegate {
420420
// - Now the key file...
421421
if let keyFilePath = configuration.keyFilePath {
422422

423-
if !NSFileManager.defaultManager().fileExists(atPath: keyFilePath) {
423+
if !FileManager.default().fileExists(atPath: keyFilePath) {
424424

425425
throw SSLError.fail(Int(ENOENT), "Key file doesn't exist at specified path.")
426426
}
@@ -429,7 +429,7 @@ public class SSLService : SSLServiceDelegate {
429429
// - Finally, if present, the certificate chain path...
430430
if let chainPath = configuration.certificateChainFilePath {
431431

432-
if !NSFileManager.defaultManager().fileExists(atPath: chainPath) {
432+
if !FileManager.default().fileExists(atPath: chainPath) {
433433

434434
throw SSLError.fail(Int(ENOENT), "Certificate chain doesn't exist at specified path.")
435435
}
@@ -439,7 +439,7 @@ public class SSLService : SSLServiceDelegate {
439439
// - First the CA...
440440
if let caFile = configuration.caCertificateFilePath {
441441

442-
if !FileManager.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,11 +448,11 @@ public class SSLService : SSLServiceDelegate {
448448
if let caPath = configuration.caCertificateDirPath {
449449

450450
var isDir: ObjCBool = false
451-
if !FileManager.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
}
455-
if !isDir {
455+
if !isDir.boolValue {
456456

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

464-
if !FileManager.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 !FileManager.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 !FileManager.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)