Merge pull request #131 from nodes-vapor/feature/fix-swift-5-warnings

Feature/fix swift 5 warnings

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.1
+// swift-tools-version:4.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Sources/AdminPanel/Controllers/LoginController.swift

@@ -62,7 +62,7 @@ fileprivate extension LoginController {
         private let password: String
     }
 
-    fileprivate struct RenderLogin: Encodable {
+    struct RenderLogin: Encodable {
         fileprivate let queryString: String?
     }
 }

Sources/AdminPanel/Helpers/SidebarMenuPathGenerator.swift

@@ -1,7 +1,7 @@
 public typealias SidebarMenuPathGenerator<U: AdminPanelUserRoleType> = ((U?) -> String)
 
 public extension AdminPanelUserRoleType {
-    public static var sidebarMenuPathGenerator: SidebarMenuPathGenerator<Self> {
+    static var sidebarMenuPathGenerator: SidebarMenuPathGenerator<Self> {
         return { role in
             role?.menuPath ?? ""
         }

Sources/AdminPanel/Models/AdminPanelUser/AdminPanelUserType.swift

@@ -34,7 +34,7 @@ extension AdminPanelUserType {
 }
 
 public extension AdminPanelUserType {
-    public func requireRole(_ role: Self.Role?) throws {
+    func requireRole(_ role: Self.Role?) throws {
         guard
             let myRole = self.role,
             let requiredRole = role,

Sources/AdminPanel/Models/AdminPanelUser/Extensions/AdminPanelUser+Submittable.swift

@@ -1,5 +1,4 @@
 import Fluent
-import Reset
 import Submissions
 import Sugar
 import Validation

Sources/AdminPanel/Providers/AdminPanelProvider.swift

@@ -12,7 +12,7 @@ import Vapor
 
 // MARK: - Commands
 public extension AdminPanelProvider where U: Seedable {
-    public static func commands(
+    static func commands(
         databaseIdentifier: DatabaseIdentifier<U.Database>
     ) -> [String: Command] {
         return ["adminpanel:user-seeder": SeederCommand<U>(databaseIdentifier: databaseIdentifier)]
@@ -126,7 +126,7 @@ extension ResetResponses {
 }
 
 public extension LeafTagConfig {
-    public mutating func useAdminPanelLeafTags<U: AdminPanelUserType>(
+    mutating func useAdminPanelLeafTags<U: AdminPanelUserType>(
         _ type: U.Type,
         paths: TagTemplatePaths = .init()
     ) {

Sources/AdminPanel/routes.swift

@@ -1,6 +1,5 @@
 import Authentication
 import Flash
-import Reset
 import Routing
 import Sugar
 import Vapor
@@ -49,7 +48,7 @@ public struct AdminPanelMiddlewares: Service {
 }
 
 public extension Router {
-    public func useAdminPanelRoutes<U: AdminPanelUserType>(
+    func useAdminPanelRoutes<U: AdminPanelUserType>(
         _ type: U.Type,
         on container: Container
     ) throws {