Import "Keychain" via Swift Package Manager instead of git submodule

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,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", branch: "master"),
 	],
 	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

@@ -19,17 +19,13 @@
 //
 
 import Foundation
-#if !NO_KEYCHAIN_IMPORT     // needs to be imported when using `swift build`, not when building via Xcode
-@preconcurrency import SwiftKeychain
-#endif
-
+import SwiftKeychain
 
 /**
 Keychain integration handler for OAuth2.
 */
 @OAuth2Actor
 struct OAuth2KeychainAccount: KeychainGenericPasswordType {
-	
 	/// The service name to use.
 	let serviceName: String
 
@@ -40,7 +36,7 @@ struct OAuth2KeychainAccount: KeychainGenericPasswordType {
 	var accessGroup: String?
 
 	/// Data that ends up in the keychain.
-	var data = [String: Any]()
+	var data = KeychainData()
 
 	/// Keychain access mode.
 	let accessMode: String
@@ -66,7 +62,7 @@ struct OAuth2KeychainAccount: KeychainGenericPasswordType {
 extension KeychainGenericPasswordType {
 
 	/// Data to store to the keychain.
-	var dataToStore: [String: Any] {
+	var dataToStore: KeychainData {
 		return data
 	}
 

OAuth2.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -38,7 +38,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.15'
   s.tvos.deployment_target = '12.0'
   s.pod_target_xcconfig = {
-    'OTHER_SWIFT_FLAGS' => '-DNO_MODULE_IMPORT -DNO_KEYCHAIN_IMPORT'
+    'OTHER_SWIFT_FLAGS' => '-DNO_MODULE_IMPORT'
   }
 
   s.source_files = [