Fix compilation on older Swift versions

Author: Frizlab

Package.swift

@@ -14,7 +14,7 @@ let package = Package(
 	targets: [
 		.target(name: "CLTLogger", dependencies: [
 			.product(name: "Logging", package: "swift-log"),
-		], path: "Sources"),
+		], path: "Sources", exclude: ["CLTLogger+WithSendable.swift"]),
 		.testTarget(name: "CLTLoggerTests", dependencies: ["CLTLogger"])
 	]
 )

[email protected]

@@ -22,7 +22,7 @@ let package = Package(
 	targets: [
 		.target(name: "CLTLogger", dependencies: [
 			.product(name: "Logging", package: "swift-log"),
-		], path: "Sources", swiftSettings: swiftSettings),
+		], path: "Sources", exclude: ["CLTLogger+NoSendable.swift"], swiftSettings: swiftSettings),
 		.testTarget(name: "CLTLoggerTests", dependencies: ["CLTLogger"], swiftSettings: swiftSettings)
 	]
 )

Sources/CLTLogger+NoSendable.swift

@@ -0,0 +1,29 @@
+import Foundation
+
+import Logging
+
+
+
+extension CLTLogger {
+	
+	public init(label: String, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) {
+		self.init(metadataProvider: metadataProvider)
+	}
+	
+	public static func initWithLabelMetadata(label: String, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) -> CLTLogger {
+		var res = self.init(metadataProvider: metadataProvider)
+		res.metadata = ["zz-label": "\(label)"]
+		return res
+	}
+	
+	public static func initWithDateMetadata(label: String, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) -> CLTLogger {
+		return self.init(metadataProvider: .init{ ["zz-date": "\(Date())"].merging(metadataProvider?.get() ?? [:], uniquingKeysWith: { _, new in new }) })
+	}
+	
+	public static func initWithLabelAndDateMetadata(label: String, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) -> CLTLogger {
+		var res = self.init(metadataProvider: .init{ ["zz-date": "\(Date())"].merging(metadataProvider?.get() ?? [:], uniquingKeysWith: { _, new in new }) })
+		res.metadata = ["zz-label": "\(label)"]
+		return res
+	}
+	
+}

Sources/CLTLogger+WithSendable.swift

@@ -0,0 +1,36 @@
+import Foundation
+
+import Logging
+
+
+
+/* The @Sendable attribute is only available starting at Swift 5.5.
+ * We make these methods only available starting at Swift 5.8 for our convenience (avoids creating another Package@swift-... file)
+ *  and because for Swift <5.8 the non-@Sendable variants of the methods are available. */
+extension CLTLogger {
+	
+	@Sendable
+	public init(label: String, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) {
+		self.init(metadataProvider: metadataProvider)
+	}
+	
+	@Sendable
+	public static func initWithLabelMetadata(label: String, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) -> CLTLogger {
+		var res = self.init(metadataProvider: metadataProvider)
+		res.metadata = ["zz-label": "\(label)"]
+		return res
+	}
+	
+	@Sendable
+	public static func initWithDateMetadata(label: String, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) -> CLTLogger {
+		return self.init(metadataProvider: .init{ ["zz-date": "\(Date())"].merging(metadataProvider?.get() ?? [:], uniquingKeysWith: { _, new in new }) })
+	}
+	
+	@Sendable
+	public static func initWithLabelAndDateMetadata(label: String, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) -> CLTLogger {
+		var res = self.init(metadataProvider: .init{ ["zz-date": "\(Date())"].merging(metadataProvider?.get() ?? [:], uniquingKeysWith: { _, new in new }) })
+		res.metadata = ["zz-label": "\(label)"]
+		return res
+	}
+	
+}

Sources/CLTLogger.swift

@@ -132,11 +132,6 @@ public struct CLTLogger : LogHandler {
 	public let multilineMode: MultilineMode
 	public let constantsByLevel: [Logger.Level: Constants]
 
-	@Sendable
-	public init(label: String, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) {
-		self.init(metadataProvider: metadataProvider)
-	}
-	
 	public init(fileHandle: FileHandle = .standardError, multilineMode: MultilineMode = .default, logStyle: Style = .auto, metadataProvider: Logger.MetadataProvider? = LoggingSystem.metadataProvider) {
 		let logPrefixStyle = (logStyle != .auto ? logStyle : CLTLogger.autoLogStyle(with: fileHandle))