Skip to content

Commit 859746f

Browse files
committed
Keep standard GRDB as default
1 parent eae1dad commit 859746f

2 files changed

Lines changed: 20 additions & 14 deletions

File tree

Package.resolved

Lines changed: 4 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ let package = Package(
2121
),
2222
],
2323
traits: [
24+
.default(enabledTraits: ["GRDB"]),
25+
.trait(
26+
name: "GRDB",
27+
description: "Use the standard GRDB package."
28+
),
2429
.trait(
2530
name: "SQLiteDataTagged",
2631
description: "Introduce SQLiteData conformances to the swift-tagged package."
@@ -32,6 +37,7 @@ let package = Package(
3237
],
3338
dependencies: [
3439
.package(url: "https://github.com/apple/swift-collections", from: "1.0.0"),
40+
.package(url: "https://github.com/groue/GRDB.swift", from: "7.6.0"),
3541
.package(
3642
url: "https://github.com/swift-everywhere/grdb-sqlcipher.git",
3743
from: "7.5.0",
@@ -62,7 +68,16 @@ let package = Package(
6268
dependencies: [
6369
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
6470
.product(name: "Dependencies", package: "swift-dependencies"),
65-
.product(name: "GRDB", package: "grdb-sqlcipher"),
71+
.product(
72+
name: "GRDB",
73+
package: "GRDB.swift",
74+
condition: .when(traits: ["GRDB"])
75+
),
76+
.product(
77+
name: "GRDB",
78+
package: "grdb-sqlcipher",
79+
condition: .when(traits: ["GRDBCIPHER"])
80+
),
6681
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
6782
.product(name: "OrderedCollections", package: "swift-collections"),
6883
.product(name: "Perception", package: "swift-perception"),

0 commit comments

Comments
 (0)