Fixes for Swift 4.2

vapor-community · Sep 20, 2018 · cf06efb · cf06efb
1 parent 0b3acfa
commit cf06efb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Sources/LoggingExample/main.swift b/Sources/LoggingExample/main.swift
@@ -26,9 +26,9 @@ public func configure(_ config: inout Config, _ env: inout Environment, _ servic
     try services.register(DiscordLoggerConfig(prodURL: "DiscordTokenGoesHere", useEmbeds: true))
     services.register(DiscordLogger.self)
 
-    services.register(VaporLoggingConfig(types: [.discord, .console]))
-    services.register(VaporLogger.self)
-    config.prefer(VaporLogger.self, for: Logger.self)
+    services.register(MultiLoggerConfig(types: [.discord, .console]))
+    services.register(MultiLogger.self)
+    config.prefer(MultiLogger.self, for: Logger.self)
 }
 
 public func routes(_ router: Router) throws {

diff --git a/Sources/MultiLogging/DiscordLogger.swift b/Sources/MultiLogging/DiscordLogger.swift
@@ -61,7 +61,7 @@ public class DiscordLogger: ServiceType, Logger {
     let client: Client
     let isRelease: Bool
 
-    public init(_ config: DiscordLoggerConfig, _ client: Client, _ isRelease: Bool) {
+    public required init(_ config: DiscordLoggerConfig, _ client: Client, _ isRelease: Bool) {
         self.config = config
         self.client = client
         self.isRelease = isRelease

diff --git a/Sources/MultiLogging/FileLogger.swift b/Sources/MultiLogging/FileLogger.swift
@@ -50,7 +50,7 @@ public class FileLogger: ServiceType, Logger {
     let config: FileLoggerConfig
     let isRelease: Bool
 
-    public init(_ config: FileLoggerConfig, _ isRelease: Bool) {
+    public required init(_ config: FileLoggerConfig, _ isRelease: Bool) {
         self.config = config
         self.isRelease = isRelease
     }

diff --git a/Sources/MultiLogging/MultiLogger.swift b/Sources/MultiLogging/MultiLogger.swift
@@ -16,7 +16,7 @@ public struct MultiLoggerConfig: Service {
 }
 
 public class MultiLogger: ServiceType, Logger {
-    init(_ loggers: [Logger]) {
+    required init(_ loggers: [Logger]) {
         self.loggers = loggers
     }
 

diff --git a/Sources/MultiLogging/SlackLogger.swift b/Sources/MultiLogging/SlackLogger.swift
@@ -61,7 +61,7 @@ public class SlackLogger: ServiceType, Logger {
     let client: Client
     let isRelease: Bool
 
-    public init(_ config: SlackLoggerConfig, _ client: Client, _ isRelease: Bool) {
+    public required init(_ config: SlackLoggerConfig, _ client: Client, _ isRelease: Bool) {
         self.config = config
         self.client = client
         self.isRelease = isRelease