Migrate to SwiftKeychain v2.1.0 (#23)

Author: DominikPalo

.github/workflows/build.yml

@@ -17,10 +17,10 @@ jobs:
         swift: ['swift6', 'swift5']
         include:
           - swift: 'swift6'
-            xcode-path: '/Applications/Xcode_16.0.0.app'
+            xcode-path: '/Applications/Xcode_16.2.app'
             macos: 'macos-14'
           - swift: 'swift5'
-            xcode-path: '/Applications/Xcode_15.4.0.app'
+            xcode-path: '/Applications/Xcode_15.4.app'
             macos: 'macos-14'
 
     env:

.gitmodules

@@ -1 +1 @@
-5.3
+5.5.3

.swift-version

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.5
 //
 //  Package.swift
 //  OAuth2
@@ -30,14 +30,12 @@ let package = Package(
 		.library(name: "OAuth2", targets: ["OAuth2"]),
 	],
 	dependencies: [
-		// SwiftKeychain is not yet available as a Package, so we symlink to /Sources and make it a Target
-		//.package(url: "https://github.com/yankodimitrov/SwiftKeychain.git", majorVersion: 1),
+		.package(url: "https://github.com/slidoapp/SwiftKeychain.git", .upToNextMinor(from: "2.1.0")),
 	],
 	targets: [
 		.target(name: "OAuth2",
 			dependencies: ["Base", "Flows", "DataLoader"]),
-		.target(name: "SwiftKeychain"),
-		.target(name: "Base", dependencies: [.target(name: "SwiftKeychain")]),
+		.target(name: "Base", dependencies: ["SwiftKeychain"]),
 		.target(name: "macOS", dependencies: [.target(name: "Base")]),
 		.target(name: "iOS", dependencies: [.target(name: "Base")]),
 		.target(name: "tvOS", dependencies: [.target(name: "Base")]),

OAuth2.xcodeproj/project.pbxproj

@@ -208,18 +208,26 @@ open class OAuth2Base: OAuth2Securable {
 		return authURL.description
 	}
 
-	override open func updateFromKeychainItems(_ items: [String: Any]) {
+	override open func updateFromKeychainItems(_ items: [String: any Sendable]) {
 		for message in clientConfig.updateFromStorableItems(items) {
 			logger?.debug("OAuth2", msg: message)
 		}
 		clientConfig.secretInBody = (clientConfig.endpointAuthMethod == OAuth2EndpointAuthMethod.clientSecretPost)
 	}
 
-	override open func storableCredentialItems() -> [String: Any]? {
+	override open func storableCredentialClasses() -> [AnyClass] {
+		return clientConfig.storableCredentialClasses()
+	}
+	
+	override open func storableCredentialItems() -> [String: any Sendable]? {
 		return clientConfig.storableCredentialItems()
 	}
 
-	override open func storableTokenItems() -> [String: Any]? {
+	override open func storableTokenClasses() -> [AnyClass] {
+		return clientConfig.storableTokenClasses()
+	}
+	
+	override open func storableTokenItems() -> [String: any Sendable]? {
 		return clientConfig.storableTokenItems()
 	}
 

OAuth2.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -204,6 +204,15 @@ open class OAuth2ClientConfig {
 		}
 	}
 
+	/**
+	Enumerates all classes used for storing credential items.
+	
+	- returns: An array containing all classes used for storing credential items
+	*/
+	func storableCredentialClasses() -> [AnyClass] {
+		return []
+	}
+	
 	/**
 	Creates a dictionary of credential items that can be stored to the keychain.
 
@@ -220,6 +229,15 @@ open class OAuth2ClientConfig {
 		return items
 	}
 
+	/**
+	Enumerates all classes used for storing token items.
+	
+	- returns: An array containing all classes used for storing token items
+	*/
+	func storableTokenClasses() -> [AnyClass] {
+		return [NSDate.self]
+	}
+	
 	/**
 	Creates a dictionary of token items that can be stored to the keychain.