Skip to content

Commit eba8f85

Browse files
committed
Enables SQLCipher in Package.swift.
1 parent 36e30a6 commit eba8f85

1 file changed

Lines changed: 10 additions & 15 deletions

File tree

Package.swift

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ if ProcessInfo.processInfo.environment["SPI_BUILDER"] == "1" {
3939
}
4040

4141
// GRDB+SQLCipher: Uncomment those lines
42-
//dependencies.append(.package(url: "https://github.com/sqlcipher/SQLCipher.swift.git", from: "4.11.0"))
43-
//cSettings.append(.define("SQLITE_HAS_CODEC"))
44-
//swiftSettings.append(.define("SQLITE_HAS_CODEC"))
45-
//swiftSettings.append(.define("SQLCipher"))
42+
dependencies.append(.package(url: "https://github.com/sqlcipher/SQLCipher.swift.git", from: "4.11.0"))
43+
cSettings.append(.define("SQLITE_HAS_CODEC"))
44+
swiftSettings.append(.define("SQLITE_HAS_CODEC"))
45+
swiftSettings.append(.define("SQLCipher"))
4646

4747
let package = Package(
4848
name: "GRDB",
@@ -55,29 +55,24 @@ let package = Package(
5555
],
5656
products: [
5757
// GRDB+SQLCipher: Delete the GRDBSQLite library
58-
.library(name: "GRDBSQLite", targets: ["GRDBSQLite"]),
5958
.library(name: "GRDB", targets: ["GRDB"]),
6059
.library(name: "GRDB-dynamic", type: .dynamic, targets: ["GRDB"]),
6160
],
6261
dependencies: dependencies,
6362
targets: [
6463
// GRDB+SQLCipher: Delete the GRDBSQLite target
65-
.systemLibrary(
66-
name: "GRDBSQLite",
67-
providers: [.apt(["libsqlite3-dev"])]),
6864
// GRDB+SQLCipher: Uncomment the GRDBSQLCipher target
69-
//.target(
70-
// name: "GRDBSQLCipher",
71-
// dependencies: [.product(name: "SQLCipher", package: "SQLCipher.swift")]
72-
//),
65+
.target(
66+
name: "GRDBSQLCipher",
67+
dependencies: [.product(name: "SQLCipher", package: "SQLCipher.swift")]
68+
),
7369
.target(
7470
name: "GRDB",
7571
dependencies: [
7672
// GRDB+SQLCipher: Delete the GRDBSQLite dependency
77-
.target(name: "GRDBSQLite"),
7873
// GRDB+SQLCipher: Uncomment the SQLCipher and GRDBSQLCipher dependencies
79-
//.product(name: "SQLCipher", package: "SQLCipher.swift"),
80-
//.target(name: "GRDBSQLCipher"),
74+
.product(name: "SQLCipher", package: "SQLCipher.swift"),
75+
.target(name: "GRDBSQLCipher"),
8176
],
8277
path: "GRDB",
8378
resources: [.copy("PrivacyInfo.xcprivacy")],

0 commit comments

Comments
 (0)