From c99c9c0f396f3b9916fee95077d88498c7c9ca7e Mon Sep 17 00:00:00 2001 From: RockfordWei Date: Tue, 16 Jan 2018 15:35:40 -0500 Subject: [PATCH 1/2] Upgrade to Swift 4.0 --- Package.swift | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Package.swift b/Package.swift index 7fdb806..91e9b88 100644 --- a/Package.swift +++ b/Package.swift @@ -1,20 +1,10 @@ -// Generated automatically by Perfect Assistant Application -// Date: 2017-06-02 20:23:17 +0000 +import Foundation import PackageDescription let package = Package( - name: "APIDocumentationServer", - targets: [], - dependencies: [ - .Package(url: "https://github.com/PerfectlySoft/Perfect-HTTPServer.git", majorVersion: 2), - .Package(url: "https://github.com/SwiftORM/Postgres-StORM.git", majorVersion: 1), - .Package(url: "https://github.com/PerfectlySoft/Perfect-RequestLogger.git", majorVersion: 1), - .Package(url: "https://github.com/PerfectlySoft/Perfect-SMTP", majorVersion: 1), - .Package(url: "https://github.com/iamjono/SwiftMoment.git", majorVersion: 0), - .Package(url: "https://github.com/iamjono/JSONConfig.git", majorVersion: 0), - .Package(url: "https://github.com/iamjono/SwiftString.git", majorVersion: 1), - .Package(url: "https://github.com/PerfectlySoft/Perfect-Session-PostgreSQL.git", majorVersion: 1), - .Package(url: "https://github.com/PerfectlySoft/Perfect-Mustache.git", majorVersion: 2), - .Package(url: "https://github.com/PerfectlySoft/Perfect-LocalAuthentication-PostgreSQL.git", majorVersion: 1), - .Package(url: "https://github.com/PerfectlySoft/Perfect-Markdown.git", majorVersion: 1), - ] + name: "APIDocumentationServer", + targets: [], + dependencies: [ + .Package(url: "https://github.com/PerfectlySoft/Perfect-LocalAuthentication-PostgreSQL.git", majorVersion: 3), + .Package(url: "https://github.com/PerfectlySoft/Perfect-Markdown.git", majorVersion: 3), + ] ) From af20e607c5fa6a9818de7a9378accba7d40a3a14 Mon Sep 17 00:00:00 2001 From: RockfordWei Date: Tue, 16 Jan 2018 15:43:11 -0500 Subject: [PATCH 2/2] Upgrading the library names. --- Sources/APIDocumentationServer/Handlers/user/login.swift | 2 +- Sources/APIDocumentationServer/Handlers/user/userDelete.swift | 2 +- Sources/APIDocumentationServer/Handlers/user/userList.swift | 2 +- Sources/APIDocumentationServer/Handlers/user/userMod.swift | 2 +- .../APIDocumentationServer/Handlers/user/userModAction.swift | 2 +- Sources/APIDocumentationServer/Routing/Routes.swift | 2 +- Sources/APIDocumentationServer/main.swift | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Sources/APIDocumentationServer/Handlers/user/login.swift b/Sources/APIDocumentationServer/Handlers/user/login.swift index 9821160..53ec330 100644 --- a/Sources/APIDocumentationServer/Handlers/user/login.swift +++ b/Sources/APIDocumentationServer/Handlers/user/login.swift @@ -11,7 +11,7 @@ import PerfectHTTP import PerfectSession import PerfectCrypto import PerfectSessionPostgreSQL -import LocalAuthentication +import PerfectLocalAuthentication extension LocalAuthWebHandlers { diff --git a/Sources/APIDocumentationServer/Handlers/user/userDelete.swift b/Sources/APIDocumentationServer/Handlers/user/userDelete.swift index da5937a..b87eb03 100644 --- a/Sources/APIDocumentationServer/Handlers/user/userDelete.swift +++ b/Sources/APIDocumentationServer/Handlers/user/userDelete.swift @@ -10,7 +10,7 @@ import SwiftMoment import PerfectHTTP import PerfectLogger -import LocalAuthentication +import PerfectLocalAuthentication extension WebHandlers { diff --git a/Sources/APIDocumentationServer/Handlers/user/userList.swift b/Sources/APIDocumentationServer/Handlers/user/userList.swift index c850ec6..93bb361 100644 --- a/Sources/APIDocumentationServer/Handlers/user/userList.swift +++ b/Sources/APIDocumentationServer/Handlers/user/userList.swift @@ -10,7 +10,7 @@ import SwiftMoment import PerfectHTTP import PerfectLogger -import LocalAuthentication +import PerfectLocalAuthentication extension WebHandlers { diff --git a/Sources/APIDocumentationServer/Handlers/user/userMod.swift b/Sources/APIDocumentationServer/Handlers/user/userMod.swift index 5278842..8d8c6ef 100644 --- a/Sources/APIDocumentationServer/Handlers/user/userMod.swift +++ b/Sources/APIDocumentationServer/Handlers/user/userMod.swift @@ -10,7 +10,7 @@ import SwiftMoment import PerfectHTTP import PerfectLogger -import LocalAuthentication +import PerfectLocalAuthentication extension WebHandlers { diff --git a/Sources/APIDocumentationServer/Handlers/user/userModAction.swift b/Sources/APIDocumentationServer/Handlers/user/userModAction.swift index 7c1a254..7fb64bd 100644 --- a/Sources/APIDocumentationServer/Handlers/user/userModAction.swift +++ b/Sources/APIDocumentationServer/Handlers/user/userModAction.swift @@ -10,7 +10,7 @@ import SwiftMoment import PerfectHTTP import PerfectLogger -import LocalAuthentication +import PerfectLocalAuthentication extension WebHandlers { diff --git a/Sources/APIDocumentationServer/Routing/Routes.swift b/Sources/APIDocumentationServer/Routing/Routes.swift index 8fcbe95..236ac89 100644 --- a/Sources/APIDocumentationServer/Routing/Routes.swift +++ b/Sources/APIDocumentationServer/Routing/Routes.swift @@ -7,7 +7,7 @@ // import PerfectHTTPServer -import LocalAuthentication +import PerfectLocalAuthentication func mainMonitorRoutes() -> [[String: Any]] { diff --git a/Sources/APIDocumentationServer/main.swift b/Sources/APIDocumentationServer/main.swift index 26192f2..383be2a 100644 --- a/Sources/APIDocumentationServer/main.swift +++ b/Sources/APIDocumentationServer/main.swift @@ -24,7 +24,7 @@ import PerfectRequestLogger import PerfectSession import PerfectSessionPostgreSQL import PerfectCrypto -import LocalAuthentication +import PerfectLocalAuthentication let _ = PerfectCrypto.isInitialized