Swift 6 language mode support (#22)

- Adds dedicated package manifest files for Swift 6
- Adds required Sendable support
- Marks some OSLogStore related elements with pre concurrency and
retroactive (for testing purposes)
- `OSLogClient.pollingInterval` now requires `async`
- Updated shared instance structure to better support concurrency

Author: mobrien-ghost

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -19,6 +19,9 @@ let package = Package(
             name: "OSLogClient",
             resources: [
                 .copy("Resources/PrivacyInfo.xcprivacy")
+            ],
+            swiftSettings: [
+                .swiftLanguageMode(.v6)
             ]
         ),
         .testTarget(

[email protected]

@@ -0,0 +1,29 @@
+// swift-tools-version: 5.10
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "OSLogClient",
+    platforms: [.macOS(.v12), .iOS(.v15), .watchOS(.v8), .tvOS(.v15)],
+    products: [
+        // Products define the executables and libraries a package produces, making them visible to other packages.
+        .library(
+            name: "OSLogClient",
+            targets: ["OSLogClient"]),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .target(
+            name: "OSLogClient",
+            resources: [
+                .copy("Resources/PrivacyInfo.xcprivacy")
+            ]
+        ),
+        .testTarget(
+            name: "OSLogClientTests",
+            dependencies: ["OSLogClient"]
+        ),
+    ]
+)

[email protected]

@@ -0,0 +1,29 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "OSLogClient",
+    platforms: [.macOS(.v12), .iOS(.v15), .watchOS(.v8), .tvOS(.v15)],
+    products: [
+        // Products define the executables and libraries a package produces, making them visible to other packages.
+        .library(
+            name: "OSLogClient",
+            targets: ["OSLogClient"]),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .target(
+            name: "OSLogClient",
+            resources: [
+                .copy("Resources/PrivacyInfo.xcprivacy")
+            ]
+        ),
+        .testTarget(
+            name: "OSLogClientTests",
+            dependencies: ["OSLogClient"]
+        ),
+    ]
+)

Sources/OSLogClient/Internal/ProcessInfoProvider.swift

@@ -9,7 +9,7 @@ import Foundation
 
 /// Internal protocol used to facilitate unit-testing only support for some scenarios.
 /// This is due to not being able to use a traditional spy/mock setup for actors.
-protocol ProcessInfoEnvironmentProvider: AnyObject {
+protocol ProcessInfoEnvironmentProvider: AnyObject, Sendable {
 
     /// Dictionary of environment variables available from the current process.
     var processInfoEnvironment: [String : String] { get }

Sources/OSLogClient/Public/LastProcessedStrategy/InMemoryLastProcessedStrategy.swift

@@ -5,12 +5,17 @@
 //  Created by Joshua Asbury on 24/8/2024.
 //
 
-public class InMemoryLastProcessedStrategy: LastProcessedStrategy {
+public final class InMemoryLastProcessedStrategy: LastProcessedStrategy, Equatable, @unchecked Sendable {
+
     public var date: Date?
 
     public func setLastProcessedDate(_ date: Date?) {
         self.date = date
     }
+
+    public static func == (lhs: InMemoryLastProcessedStrategy, rhs: InMemoryLastProcessedStrategy) -> Bool {
+        lhs.date == rhs.date
+    }
 }
 
 public extension LastProcessedStrategy where Self == InMemoryLastProcessedStrategy {

Sources/OSLogClient/Public/LastProcessedStrategy/LastProcessedStrategy.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 /// Enumeration of supported strategies for storing and updating the `Date` the log store was last successfully queried and processed.
-public protocol LastProcessedStrategy {
+public protocol LastProcessedStrategy: Sendable {
     /// The most recent `Date` of a processed/polled log
     var date: Date? { get }
 

Sources/OSLogClient/Public/LastProcessedStrategy/UserDefaultsLastProcessedStrategy.swift

@@ -7,8 +7,37 @@
 
 import Foundation
 
-public struct UserDefaultsLastProcessedStrategy: LastProcessedStrategy {
-    let defaults: UserDefaults
+final class SendableUserDefaults: @unchecked Sendable {
+
+    var target: UserDefaults
+
+    init(_ target: UserDefaults) {
+        self.target = target
+    }
+
+    func setValue(_ value: Any?, forKey key: String) {
+        target.set(value, forKey: key)
+    }
+
+    func value(forKey key: String) -> Any? {
+        target.value(forKey: key)
+    }
+
+    func removeObject(forKey defaultName: String) {
+        target.removeObject(forKey: defaultName)
+    }
+}
+
+public struct UserDefaultsLastProcessedStrategy: LastProcessedStrategy, Equatable, Sendable {
+
+    // MARK: - Properties
+
+    var sendableDefaults: SendableUserDefaults
+
+    var defaults: UserDefaults {
+        sendableDefaults.target
+    }
+
     let key: String
 
     public var date: Date? {
@@ -18,9 +47,11 @@ public struct UserDefaultsLastProcessedStrategy: LastProcessedStrategy {
         return Date(timeIntervalSince1970: timestamp)
     }
 
+    // MARK: - Lifecycle
+
     public init(key: String, defaults: UserDefaults = .standard) {
         self.key = key
-        self.defaults = defaults
+        self.sendableDefaults = SendableUserDefaults(defaults)
     }
 
     public mutating func setLastProcessedDate(_ date: Date?) {
@@ -30,6 +61,10 @@ public struct UserDefaultsLastProcessedStrategy: LastProcessedStrategy {
             defaults.removeObject(forKey: key)
         }
     }
+
+    public static func == (lhs: UserDefaultsLastProcessedStrategy, rhs: UserDefaultsLastProcessedStrategy) -> Bool {
+        lhs.date == rhs.date
+    }
 }
 
 public extension LastProcessedStrategy where Self == UserDefaultsLastProcessedStrategy {

Sources/OSLogClient/Public/LogDriver.swift

@@ -11,7 +11,7 @@ import OSLog
 /// `LogDriver` instances are responsible for handling processed os logs.
 /// Instances, when registered with the ``OSLogClient`` instance, will be sent logs from the `OSLogStore`.
 /// If  ``LogFilter``s are provided any incoming logs will be assessed against the filter rules and ignored if no matches are found.
-open class LogDriver: Equatable {
+open class LogDriver: Equatable, @unchecked Sendable {
     // MARK: - Supplementary
 
     /// Enumeration of supported log levels.