Add StrictConcurrency checks when possible

Author: Frizlab

Package.swift

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

[email protected]

@@ -0,0 +1,22 @@
+// swift-tools-version:5.8
+import PackageDescription
+
+
+//let swiftSettings: [SwiftSetting] = []
+let swiftSettings: [SwiftSetting] = [.enableExperimentalFeature("StrictConcurrency")]
+
+let package = Package(
+	name: "oslog-logger",
+	products: [
+		.library(name: "OSLogLogger", targets: ["OSLogLogger"])
+	],
+	dependencies: [
+		.package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
+	],
+	targets: [
+		.target(name: "OSLogLogger", dependencies: [
+			.product(name: "Logging",   package: "swift-log"),
+		], path: "Sources", exclude: ["OSLogLogger+NoSendable.swift"], swiftSettings: swiftSettings),
+		.testTarget(name: "OSLogLoggerTests", dependencies: ["OSLogLogger"], path: "Tests", swiftSettings: swiftSettings),
+	]
+)

Sources/DummySendable.swift

@@ -0,0 +1,12 @@
+import Foundation
+import os
+
+
+#if swift(>=5.5)
+public protocol GHALogger_Sendable : Sendable {}
+#else
+public protocol GHALogger_Sendable {}
+#endif
+
+@available(macOS 11.0, tvOS 14.0, iOS 14.0, watchOS 7.0, *)
+extension Logger : GHALogger_Sendable {}

Sources/OSLogLogger+NoSendable.swift

@@ -0,0 +1,30 @@
+import Foundation
+
+import Logging
+
+
+
+extension OSLogLogger {
+	
+	/**
+	 Convenience init that splits the label in a subsystem and a category.
+	 
+	 The format of the label should be as follow: "subsystem:category".
+	 The subsystem _should_ be a reverse-DNS identifier (as per Apple doc).
+	 Example: "`com.xcode-actions.oslog-logger:LogHandler`".
+	 
+	 If there is no colon in the given label
+	  we set the category to “`<none>`” (it cannot be `nil`, surprisingly, and we decided against the empty String to be able to still filter this category)
+	  and we use the whole label for the subsystem.
+	 
+	 It is _not_ possible to have a subsystem containing a colon using this initializer. */
+	public init(label: String, metadataProvider: Logging.Logger.MetadataProvider? = LoggingSystem.metadataProvider) {
+		let split = label.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: false)
+		let subsystem = split[0] /* Cannot not exists as we do not omit empty subsequences in the split. */
+		let categoryCollection = split.dropFirst()
+		assert(categoryCollection.count <= 1)
+		
+		self.init(subsystem: String(subsystem), category: categoryCollection.first.flatMap(String.init) ?? "<none>", metadataProvider: metadataProvider)
+	}
+	
+}

Sources/OSLogLogger+WithSendable.swift

@@ -0,0 +1,34 @@
+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 OSLogLogger {
+	
+	/**
+	 Convenience init that splits the label in a subsystem and a category.
+	 
+	 The format of the label should be as follow: "subsystem:category".
+	 The subsystem _should_ be a reverse-DNS identifier (as per Apple doc).
+	 Example: "`com.xcode-actions.oslog-logger:LogHandler`".
+	 
+	 If there is no colon in the given label
+	  we set the category to “`<none>`” (it cannot be `nil`, surprisingly, and we decided against the empty String to be able to still filter this category)
+	  and we use the whole label for the subsystem.
+	 
+	 It is _not_ possible to have a subsystem containing a colon using this initializer. */
+	@Sendable
+	public init(label: String, metadataProvider: Logging.Logger.MetadataProvider? = LoggingSystem.metadataProvider) {
+		let split = label.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: false)
+		let subsystem = split[0] /* Cannot not exists as we do not omit empty subsequences in the split. */
+		let categoryCollection = split.dropFirst()
+		assert(categoryCollection.count <= 1)
+		
+		self.init(subsystem: String(subsystem), category: categoryCollection.first.flatMap(String.init) ?? "<none>", metadataProvider: metadataProvider)
+	}
+	
+}

Sources/OSLogLogger.swift

@@ -16,27 +16,6 @@ public struct OSLogLogger : LogHandler {
 	}
 	public var metadataProvider: Logging.Logger.MetadataProvider?
 
-	/**
-	 Convenience init that splits the label in a subsystem and a category.
-	 
-	 The format of the label should be as follow: "subsystem:category".
-	 The subsystem _should_ be a reverse-DNS identifier (as per Apple doc).
-	 Example: "`com.xcode-actions.oslog-logger:LogHandler`".
-	 
-	 If there is no colon in the given label
-	  we set the category to “`<none>`” (it cannot be `nil`, surprisingly, and we decided against the empty String to be able to still filter this category)
-	  and we use the whole label for the subsystem.
-	 
-	 It is _not_ possible to have a subsystem containing a colon using this initializer. */
-	public init(label: String, metadataProvider: Logging.Logger.MetadataProvider? = LoggingSystem.metadataProvider) {
-		let split = label.split(separator: ":", maxSplits: 1, omittingEmptySubsequences: false)
-		let subsystem = split[0] /* Cannot not exists as we do not omit empty subsequences in the split. */
-		let categoryCollection = split.dropFirst()
-		assert(categoryCollection.count <= 1)
-		
-		self.init(subsystem: String(subsystem), category: categoryCollection.first.flatMap(String.init) ?? "<none>", metadataProvider: metadataProvider)
-	}
-	
 	public init(subsystem: String, category: String, metadataProvider: Logging.Logger.MetadataProvider? = LoggingSystem.metadataProvider) {
 		self.metadataProvider = metadataProvider
 		if #available(macOS 11, tvOS 14, iOS 14, watchOS 7, *) {

Sources/UnderlyingLogger.swift

@@ -9,10 +9,10 @@ import os
  *
  * Why not use OSLog everywhere?
  * Because it is broken (at least on macOS 14/iOS 17) and the subsystem and category are not properly set. */
-internal enum UnderlyingLogger {
+internal enum UnderlyingLogger : GHALogger_Sendable {
 
 	case oslog(OSLog)
-	case logger(Any)
+	case logger(GHALogger_Sendable)
 
 	var oslog: OSLog! {
 		switch self {