Update to swift 6

Use actor for Prephirences

Author: phimage

Package.swift

@@ -1,15 +1,15 @@
-// swift-tools-version:5.5
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "Prephirences",
     platforms: [
-        .macOS(.v10_11),
-        .iOS(.v9),
-        .tvOS(.v9),
-        .watchOS(.v3)
+        .macOS(.v10_13),
+        .iOS(.v12),
+        .tvOS(.v12),
+        .watchOS(.v4)
     ],
     products: [
         .library(
@@ -24,7 +24,10 @@ let package = Package(
         .testTarget(
             name: "PrephirencesTests",
             dependencies: ["Prephirences"],
-            path: "Tests")
+            path: "Tests",
+            resources: [
+                .process("Test.plist")
+            ])
     ],
-    swiftLanguageVersions: [.v5]
+    swiftLanguageModes: [.v6]
 )

[email protected]

@@ -0,0 +1,30 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Prephirences",
+    platforms: [
+        .macOS(.v10_11),
+        .iOS(.v9),
+        .tvOS(.v9),
+        .watchOS(.v3)
+    ],
+    products: [
+        .library(
+            name: "Prephirences",
+            targets: ["Prephirences"])
+    ],
+    targets: [
+        .target(
+            name: "Prephirences",
+            dependencies: [],
+            path: "Sources"),
+        .testTarget(
+            name: "PrephirencesTests",
+            dependencies: ["Prephirences"],
+            path: "Tests")
+    ],
+    swiftLanguageVersions: [.v5]
+)

Sources/KeychainPreferences.swift

@@ -37,7 +37,7 @@ open class KeychainPreferences: PreferencesAdapter {
     // MARK: constantes
 
     /// Shared instance. service is equal to bundle identifier.
-    public static var sharedInstance = KeychainPreferences(service: Bundle.main.bundleIdentifier ?? "Prephirences")
+    nonisolated(unsafe) public static var sharedInstance = KeychainPreferences(service: Bundle.main.bundleIdentifier ?? "Prephirences")
 
     /// Class Constants
     static let klass = String(kSecClass)
@@ -55,8 +55,8 @@ open class KeychainPreferences: PreferencesAdapter {
         static let limit = String(kSecMatchLimit)
 
         struct Limit {
-            static let one = kSecMatchLimitOne
-            static let all = kSecMatchLimitAll
+            static let one = String(kSecMatchLimitOne)
+            static let all = String(kSecMatchLimitAll)
         }
     }
 
@@ -265,7 +265,7 @@ open class KeychainPreferences: PreferencesAdapter {
         query[Return.data] = kCFBooleanTrue
         query[Return.persistentRef] = kCFBooleanTrue
         query[Return.ref] = kCFBooleanTrue
-        query[Match.limit] = Match.Limit.one
+        query[Match.limit] = Match.Limit.one as CFString
 
         var result: AnyObject?
         let status = SecItemCopyMatching(query as CFDictionary, &result)
@@ -321,7 +321,7 @@ extension KeychainPreferences: MutablePreferencesType {
         var query: [String: Any] = newQuery()
         query[Attribute.account] = key
         query[Return.data] = kCFBooleanTrue
-        query[Match.limit] = Match.Limit.one
+        query[Match.limit] = Match.Limit.one as CFString
 
         var result: AnyObject?
         let status = SecItemCopyMatching(query as CFDictionary, &result)
@@ -335,7 +335,7 @@ extension KeychainPreferences: MutablePreferencesType {
     public func keys() -> [String] {
         var query: [String: Any] = newQuery()
         query[Return.attributes] = kCFBooleanTrue
-        query[Match.limit] = Match.Limit.all
+        query[Match.limit] = Match.Limit.all as CFString
 
         var result: AnyObject?
         let status = SecItemCopyMatching(query as CFDictionary, &result)
@@ -354,7 +354,7 @@ extension KeychainPreferences: MutablePreferencesType {
         #if os(iOS) || os(watchOS) || os(tvOS)
         query[Return.data] = kCFBooleanTrue
         #endif
-        query[Match.limit] = Match.Limit.all
+        query[Match.limit] = Match.Limit.all as CFString
 
         var result: AnyObject?
         let status = SecItemCopyMatching(query as CFDictionary, &result)
@@ -448,7 +448,7 @@ extension KeychainPreferences: MutablePreferencesType {
     public func clearAll() {
         var query: [String: Any] = newQuery()
         #if !os(iOS) && !os(watchOS) && !os(tvOS)
-        query[Match.limit] = Match.Limit.all
+        query[Match.limit] = Match.Limit.all as CFString
         #endif
         delete(query: query)
     }

Sources/PatternPreferences.swift

@@ -42,7 +42,7 @@ open class CompositePreferences: ExpressibleByArrayLiteral {
 
     // MARK: singleton
     /// Shared instance.
-    static let sharedInstance = CompositePreferences([])
+    nonisolated(unsafe) static let sharedInstance = CompositePreferences([])
 
     // MARK: init
     /// Initialize using an array of `PreferencesType`.

Sources/PreferencesController.swift

@@ -53,7 +53,7 @@ open class PreferencesKVCHelper: NSObject { // NSKeyValueCoding
     import AppKit
 
     @objc(PreferencesController)
-    public class PreferencesController: NSController {
+    public class PreferencesController: NSController, @unchecked Sendable {
 
         public var values = PreferencesKVCHelper(preferences: nil)
 

Sources/Prephirences.swift

@@ -28,7 +28,7 @@ SOFTWARE.
 import Foundation
 
 /* Preferences manager class that contains some Preferences */
-open class Prephirences {
+public actor Prephirences {
 
     /** Shared preferences. Could be replaced by any other preferences */
     public static var sharedInstance: PreferencesType = MutableDictionaryPreferences()
@@ -42,7 +42,7 @@ open class Prephirences {
     fileprivate static var _instances = [PrephirencesKey: PreferencesType]()
 
     /* Get Preferences for PrephirencesKey */
-    fileprivate class func instance(forKey key: PrephirencesKey, orRegister newOne: PreferencesType? = nil) -> PreferencesType? {
+    fileprivate static func instance(forKey key: PrephirencesKey, orRegister newOne: PreferencesType? = nil) -> PreferencesType? {
         if let value = self._instances[key] {
             return value
         } else if let toRegister = newOne {
@@ -51,24 +51,24 @@ open class Prephirences {
         return newOne
     }
     /* Add Preferences for PrephirencesKey */
-    fileprivate class func register(preferences: PreferencesType, forKey key: PrephirencesKey) {
+    fileprivate static func register(preferences: PreferencesType, forKey key: PrephirencesKey) {
         self._instances[key] = preferences
     }
     /* Remove Preferences for PrephirencesKey */
-    fileprivate class func unregisterPreferences(forKey key: PrephirencesKey) -> PreferencesType? {
+    fileprivate static func unregisterPreferences(forKey key: PrephirencesKey) -> PreferencesType? {
         return self._instances.removeValue(forKey: key)
     }
 
     /* Get Preferences for key */
-    open class func instance<Key: Hashable>(forKey key: Key, orRegister newOne: PreferencesType? = nil) -> PreferencesType? {
+    public static func instance<Key: Hashable>(forKey key: Key, orRegister newOne: PreferencesType? = nil) -> PreferencesType? {
         return self.instance(forKey: PrephirencesKey(key), orRegister: newOne)
     }
     /* Add Preferences for key */
-    open class func registerInstance<Key: Hashable>(_ preferences: PreferencesType, forKey key: Key) {
+    public static func registerInstance<Key: Hashable>(_ preferences: PreferencesType, forKey key: Key) {
         self.register(preferences: preferences, forKey: PrephirencesKey(key))
     }
     /* Remove Preferences for key */
-    open class func unregisterInstance<Key: Hashable>(forKey key: Key) -> PreferencesType? {
+    public static func unregisterInstance<Key: Hashable>(forKey key: Key) -> PreferencesType? {
         return self.unregisterPreferences(forKey: PrephirencesKey(key))
     }
 

Sources/UserDefaults/UserDefaults+Adds.swift

@@ -108,11 +108,11 @@ public extension Foundation.UserDefaults {
 }
 
 // MARK: Global shortcut
-public var UserDefaultsKeySeparator = "."
+nonisolated(unsafe) public var UserDefaultsKeySeparator = "."
 
 #if os(OSX)
 import AppKit
-public var UserDefaultsController = NSUserDefaultsController.shared
+nonisolated(unsafe) public var UserDefaultsController = NSUserDefaultsController.shared
 
 // http://stackoverflow.com/questions/29312106/xcode-6-os-x-storyboard-multiple-user-defaults-controllers-bug-with-multiple-sce/29509031#29509031
 @objc(SharedUserDefaultsControllerProxy)

Tests/PrephirencesTests.swift

@@ -66,7 +66,8 @@ class PrephirencesTests: XCTestCase {
     }*/
 
     func testFromFile() {
-        if let filePath = path(forResource: "Test", ofType: "plist", in: Bundle(for: type(of: self))) {
+        if let filePath = path(forResource: "Test", ofType: "plist", in: Bundle(for: type(of: self)))
+            ?? path(forResource: "Test", ofType: "plist", in: Bundle.module) {
             if  let preference = DictionaryPreferences(filePath: filePath) {
                     for (key,value) in preference.dictionary() {
                         print("\(key)=\(value)")
@@ -79,8 +80,9 @@ class PrephirencesTests: XCTestCase {
             XCTFail("Failed to get file url")
         }
 
-        if let preference = DictionaryPreferences(filename: "Test", ofType: "plist", bundle: Bundle(for: type(of: self))) ??
-            DictionaryPreferences(filePath: "Tests/Test.plist") {
+        if let preference = DictionaryPreferences(filename: "Test", ofType: "plist", bundle: Bundle(for: type(of: self)))
+            ?? DictionaryPreferences(filename: "Test", ofType: "plist", bundle: Bundle.module)
+            ?? DictionaryPreferences(filePath: "Tests/Test.plist") {
             for (key,value) in preference.dictionary() {
                 print("\(key)=\(value)")
             }
@@ -726,7 +728,7 @@ public struct MyStruct: Prephirencable {
     public static let stringValueLoaded: String? = instance["stringValueLoaded"] as? String
 
     public struct MySubLevel: Prephirencable { // swiftlint:disable:this nesting
-        public static let parent = MyStruct.instance
+        nonisolated(unsafe) public static let parent = MyStruct.instance
 
         public static let boolValue: Bool = instance["boolValue"] as? Bool ?? false
         public static let integer: Int? = instance["integer"] as? Int