Update GRDB

This commit is contained in:
Justin Mazzocchi 2020-09-07 07:25:26 -07:00
parent d3d737da86
commit df5ca6ddb2
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
4 changed files with 5 additions and 5 deletions

View file

@ -14,7 +14,7 @@ let package = Package(
targets: ["DB"]) targets: ["DB"])
], ],
dependencies: [ 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: "Mastodon"),
.package(path: "Secrets") .package(path: "Secrets")
], ],

View file

@ -17,7 +17,7 @@ public struct ContentDatabase {
let path = try Self.fileURL(identityID: identityID).path let path = try Self.fileURL(identityID: identityID).path
var configuration = Configuration() var configuration = Configuration()
configuration.prepareDatabase = { configuration.prepareDatabase {
try $0.usePassphrase(try Secrets.databaseKey(identityID: identityID, keychain: keychain)) try $0.usePassphrase(try Secrets.databaseKey(identityID: identityID, keychain: keychain))
} }

View file

@ -21,7 +21,7 @@ public struct IdentityDatabase {
let path = try FileManager.default.databaseDirectoryURL(name: Self.name).path let path = try FileManager.default.databaseDirectoryURL(name: Self.name).path
var configuration = Configuration() var configuration = Configuration()
configuration.prepareDatabase = { configuration.prepareDatabase {
try $0.usePassphrase(try Secrets.databaseKey(identityID: nil, keychain: keychain)) try $0.usePassphrase(try Secrets.databaseKey(identityID: nil, keychain: keychain))
} }

View file

@ -23,8 +23,8 @@
"package": "GRDB", "package": "GRDB",
"repositoryURL": "https://github.com/metabolist/GRDB.swift.git", "repositoryURL": "https://github.com/metabolist/GRDB.swift.git",
"state": { "state": {
"branch": "ea3ed26", "branch": "3a72e6b",
"revision": "ea3ed26ddc82f72c2d9c50111977df7671ca1e64", "revision": "3a72e6b1f57bfd3ab16d3ca262aa64b93b439bc2",
"version": null "version": null
} }
}, },