Merge pull request #35 from anthonycastelli/master

Swift 3.1 updates

.travis.yml

@@ -4,7 +4,7 @@ os:
 language: generic
 sudo: required
 dist: trusty
-osx_image: xcode8
+osx_image: xcode8.3
 script:
   - eval "$(curl -sL https://swift.vapor.sh/ci)"
   - eval "$(curl -sL https://swift.vapor.sh/codecov)"

Sources/VaporAPNS/CurlUpdater.swift

@@ -106,7 +106,7 @@ internal class CurlUpdater {
     }
 
     private func buildnghttp2() {
-        let cwd = FileManager.default.currentDirectoryPath
+        _ = FileManager.default.currentDirectoryPath
 //        print("script run from:\n" + cwd)
 //        let (currentWorkDirr, _) = shell("pwd", workPath: "\(cwd)/nghttp2")
 //        fatalError("\(currentWorkDirr)/nghttp2")
@@ -365,11 +365,7 @@ internal class CurlUpdater {
 //            args = ["bash", "-c", "\"cd \(workPath) && \(args.joined(separator: " "))\""]
 //        }
 //        print (args.joined(separator: " "))
-        #if os(macOS)
-            let task = Process()
-        #elseif os(Linux)
-            let task = Task()
-        #endif
+        let task = Process()
         task.launchPath = "/usr/bin/env"
         task.arguments = args
 

Sources/VaporAPNS/Options.swift

@@ -142,10 +142,10 @@ public struct Options: CustomStringConvertible, NodeInitializable {
             "Topic \(topic)" +
                 "\nPort \(port.rawValue)" +
                 "\nPort \(port.rawValue)" +
-                "\nCER - Certificate path: \(certPath)" +
-                "\nCER - Key path: \(keyPath)" +
-                "\nTOK - Key ID: \(keyId)" +
-                "\nTOK - Private key: \(privateKey)" +
-                "\nTOK - Public key: \(publicKey)"
+                "\nCER - Certificate path: \(String(describing: certPath))" +
+                "\nCER - Key path: \(String(describing: keyPath))" +
+                "\nTOK - Key ID: \(String(describing: keyId))" +
+                "\nTOK - Private key: \(String(describing: privateKey))" +
+                "\nTOK - Public key: \(String(describing: publicKey))"
     }
 }

Sources/VaporAPNS/String+APNS.swift

@@ -10,10 +10,6 @@ import Foundation
 import CLibreSSL
 import Core
 
-#if os(Linux)
-    typealias NSRegularExpression = RegularExpression
-#endif
-
 extension String {
     private func newECKey() throws -> OpaquePointer {
         guard let ecKey = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1) else {