From df5ca6ddb2e12d4fe41ffba7914bb7beea6a6e2b Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Mon, 7 Sep 2020 07:25:26 -0700 Subject: [PATCH] Update GRDB --- DB/Package.swift | 2 +- DB/Sources/DB/Content/ContentDatabase.swift | 2 +- DB/Sources/DB/Identity/IdentityDatabase.swift | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DB/Package.swift b/DB/Package.swift index 0e670f4..a02e314 100644 --- a/DB/Package.swift +++ b/DB/Package.swift @@ -14,7 +14,7 @@ let package = Package( targets: ["DB"]) ], dependencies: [ - .package(name: "GRDB", url: "https://github.com/metabolist/GRDB.swift.git", .revision("ea3ed26")), + .package(name: "GRDB", url: "https://github.com/metabolist/GRDB.swift.git", .revision("3a72e6b")), .package(path: "Mastodon"), .package(path: "Secrets") ], diff --git a/DB/Sources/DB/Content/ContentDatabase.swift b/DB/Sources/DB/Content/ContentDatabase.swift index a5c0c25..81ad495 100644 --- a/DB/Sources/DB/Content/ContentDatabase.swift +++ b/DB/Sources/DB/Content/ContentDatabase.swift @@ -17,7 +17,7 @@ public struct ContentDatabase { let path = try Self.fileURL(identityID: identityID).path var configuration = Configuration() - configuration.prepareDatabase = { + configuration.prepareDatabase { try $0.usePassphrase(try Secrets.databaseKey(identityID: identityID, keychain: keychain)) } diff --git a/DB/Sources/DB/Identity/IdentityDatabase.swift b/DB/Sources/DB/Identity/IdentityDatabase.swift index 75c034c..0e27dca 100644 --- a/DB/Sources/DB/Identity/IdentityDatabase.swift +++ b/DB/Sources/DB/Identity/IdentityDatabase.swift @@ -21,7 +21,7 @@ public struct IdentityDatabase { let path = try FileManager.default.databaseDirectoryURL(name: Self.name).path var configuration = Configuration() - configuration.prepareDatabase = { + configuration.prepareDatabase { try $0.usePassphrase(try Secrets.databaseKey(identityID: nil, keychain: keychain)) } diff --git a/Metatext.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Metatext.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 90d645d..1bf44a6 100644 --- a/Metatext.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Metatext.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -23,8 +23,8 @@ "package": "GRDB", "repositoryURL": "https://github.com/metabolist/GRDB.swift.git", "state": { - "branch": "ea3ed26", - "revision": "ea3ed26ddc82f72c2d9c50111977df7671ca1e64", + "branch": "3a72e6b", + "revision": "3a72e6b1f57bfd3ab16d3ca262aa64b93b439bc2", "version": null } },