Skip to content

Commit b31be05

Browse files
committed
Do not use traits, since they are not supported by Xcode
This pull request fixes #1826, which broke `make test_GRDBDemo` with Xcode 26.0.1. To reproduce the failure: - Remove from ~/Library/Developer/Xcode/DerivedData all previous builds of GRDB and related stuff - Run `make distclean test_GRDBDemo` We expect a success, but it fails with error "Unable to find module dependency: 'GRDBSQLite'".
1 parent a60810f commit b31be05

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

Package.swift

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ let darwinPlatforms: [Platform] = [
1414
]
1515
var swiftSettings: [SwiftSetting] = [
1616
.define("SQLITE_ENABLE_FTS5"),
17-
// Until Xcode has proper support for package traits, we must enable
18-
// SQLITE_ENABLE_SNAPSHOT by default so that Xcode projects that build
19-
// a Darwin app can depend on GRDB and profit from WAL snapshots.
20-
// Package traits who want to disable snapshots must set SQLITE_DISABLE_SNAPSHOT.
21-
// TODO: when Xcode support traits, remove all mentions of SQLITE_DISABLE_SNAPSHOT and update as below:
22-
// .define("SQLITE_ENABLE_SNAPSHOT", .when(platforms: darwinPlatforms, traits: ["GRDBSQLite"])),
2317
.define("SQLITE_ENABLE_SNAPSHOT"),
2418
]
2519
var cSettings: [CSetting] = []
@@ -56,10 +50,6 @@ let package = Package(
5650
.library(name: "GRDB", targets: ["GRDB"]),
5751
.library(name: "GRDB-dynamic", type: .dynamic, targets: ["GRDB"]),
5852
],
59-
traits: [
60-
"GRDBSQLite",
61-
.default(enabledTraits: ["GRDBSQLite"]),
62-
],
6353
dependencies: dependencies,
6454
targets: [
6555
.systemLibrary(
@@ -68,7 +58,7 @@ let package = Package(
6858
.target(
6959
name: "GRDB",
7060
dependencies: [
71-
.target(name: "GRDBSQLite", condition: .when(traits: ["GRDBSQLite"])),
61+
.target(name: "GRDBSQLite"),
7262
],
7363
path: "GRDB",
7464
resources: [.copy("PrivacyInfo.xcprivacy")],

0 commit comments

Comments
 (0)