From 539f864ac9d5d05297e58d45fac2e376970da6d7 Mon Sep 17 00:00:00 2001 From: Stijn Willems Date: Sat, 14 Feb 2026 17:34:15 +0100 Subject: [PATCH 1/3] fix: Use stable versions for all dependencies - GRDB: Switch from doozMen fork (branch: master) to upstream groue/GRDB.swift (from: 7.9.0) - swift-sharing: Switch from branch pin to tag 2.7.4 - swift-structured-queries: Switch from branch pin to tag 0.25.2 This enables valid tagged releases of sqlite-data. Co-Authored-By: Claude Opus 4.6 --- Package.resolved | 31 +++++++++++-------------------- Package.swift | 9 +++------ 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/Package.resolved b/Package.resolved index 12783ddb..4627a4d2 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "3c1107143d7c60927c6fc00f659a2b28094d832d3d52fb0ddac4e46ea04ada28", + "originHash" : "950d369ca553c85a30bf163f8b462d240e2602be4cb8d6e31f77bc12c4209f0f", "pins" : [ { "identity" : "combine-schedulers", @@ -13,10 +13,10 @@ { "identity" : "grdb.swift", "kind" : "remoteSourceControl", - "location" : "https://github.com/doozMen/GRDB.swift", + "location" : "https://github.com/groue/GRDB.swift", "state" : { - "branch" : "master", - "revision" : "aa0079aeb82a4bf00324561a40bffe68c6fe1c26" + "revision" : "aa0079aeb82a4bf00324561a40bffe68c6fe1c26", + "version" : "7.9.0" } }, { @@ -94,10 +94,10 @@ { "identity" : "swift-perception", "kind" : "remoteSourceControl", - "location" : "https://github.com/doozMen/swift-perception", + "location" : "https://github.com/pointfreeco/swift-perception", "state" : { - "branch" : "main", - "revision" : "9237a92716ccbcd4be8c5330ed372f243c9d23d9" + "revision" : "4f47ebafed5f0b0172cf5c661454fa8e28fb2ac4", + "version" : "2.0.9" } }, { @@ -105,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/doozMen/swift-sharing", "state" : { - "branch" : "main", - "revision" : "a367f93207aa67a7a9953946ae3b8d47d223f6af" + "revision" : "3bfc408cc2d0bee2287c174da6b1c76768377818", + "version" : "2.7.4" } }, { @@ -123,8 +123,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/doozMen/swift-structured-queries", "state" : { - "branch" : "main", - "revision" : "85f39901d6c6046fa2f5119717741d9cc8a50b7f" + "revision" : "9c84335373bae5f5c9f7b5f0adf3ae10f2cab5b9", + "version" : "0.25.2" } }, { @@ -136,15 +136,6 @@ "version" : "602.0.0" } }, - { - "identity" : "swift-tagged", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-tagged", - "state" : { - "revision" : "3907a9438f5b57d317001dc99f3f11b46882272b", - "version" : "0.10.0" - } - }, { "identity" : "xctest-dynamic-overlay", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index 5da66c6e..66bdee03 100644 --- a/Package.swift +++ b/Package.swift @@ -25,18 +25,15 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-collections", from: "1.0.0"), - // NB: Fork synced with upstream v7.9.0 - .package(url: "https://github.com/doozMen/GRDB.swift", branch: "master"), + .package(url: "https://github.com/groue/GRDB.swift", from: "7.9.0"), .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"), .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"), .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"), - // NB: Fork with Swift 6.3 fixes - .package(url: "https://github.com/doozMen/swift-sharing", branch: "fix/swift-623-optimizer-crash"), + .package(url: "https://github.com/doozMen/swift-sharing", from: "2.7.4"), .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"), - // NB: Fork with Swift 6.3 fixes .package( url: "https://github.com/doozMen/swift-structured-queries", - branch: "main", + from: "0.25.2", traits: [ .trait( name: "StructuredQueriesTagged", From 672d56677855daea667252c0244623383e54592a Mon Sep 17 00:00:00 2001 From: Stijn Willems Date: Sat, 14 Feb 2026 17:38:21 +0100 Subject: [PATCH 2/3] chore: Use doozMen/GRDB.swift 7.9.0-fork.1 fork tag Switch GRDB dependency from groue/GRDB.swift to doozMen/GRDB.swift fork with exact version 7.9.0-fork.1 for yuki-ping compatibility. Co-Authored-By: Claude Opus 4.6 --- Package.resolved | 8 ++++---- Package.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Package.resolved b/Package.resolved index 4627a4d2..cacfb440 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "950d369ca553c85a30bf163f8b462d240e2602be4cb8d6e31f77bc12c4209f0f", + "originHash" : "64c1fa61171fb84fef849e3f666d5c8777f66a28cbf6a1daf3064109f5827941", "pins" : [ { "identity" : "combine-schedulers", @@ -13,10 +13,10 @@ { "identity" : "grdb.swift", "kind" : "remoteSourceControl", - "location" : "https://github.com/groue/GRDB.swift", + "location" : "https://github.com/doozMen/GRDB.swift", "state" : { - "revision" : "aa0079aeb82a4bf00324561a40bffe68c6fe1c26", - "version" : "7.9.0" + "revision" : "7b82afdecee61df975dd7af96dc0e406327f1c8f", + "version" : "7.9.0-fork.1" } }, { diff --git a/Package.swift b/Package.swift index 66bdee03..35b5f66f 100644 --- a/Package.swift +++ b/Package.swift @@ -25,7 +25,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-collections", from: "1.0.0"), - .package(url: "https://github.com/groue/GRDB.swift", from: "7.9.0"), + .package(url: "https://github.com/doozMen/GRDB.swift", exact: "7.9.0-fork.1"), .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"), .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"), .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"), From bea63f3c011cbbc763cccf68ed0cf4975777a5d7 Mon Sep 17 00:00:00 2001 From: Stijn Willems Date: Sat, 14 Feb 2026 17:51:30 +0100 Subject: [PATCH 3/3] chore: Update to swift-structured-queries 0.30.0-fork.1 - Adds @DatabaseFunction support for computed properties (fixes SyncEngine.isSynchronizing) - Updates Package.swift dependencies to use exact version 0.30.0-fork.1 - Adds missing InlineSnapshotTesting and StructuredQueriesTestSupport dependencies to SQLiteDataTestSupport - Note: Some tests fail on Swift 6.3-dev due to compiler bug (sqlite-data issue #2) --- Package.resolved | 6 +++--- Package.swift | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index cacfb440..70cf89d1 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "64c1fa61171fb84fef849e3f666d5c8777f66a28cbf6a1daf3064109f5827941", + "originHash" : "862ba9dae9da8bb879e98cc63b111e57a32e748ca3ededbba74967181140cdd3", "pins" : [ { "identity" : "combine-schedulers", @@ -123,8 +123,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/doozMen/swift-structured-queries", "state" : { - "revision" : "9c84335373bae5f5c9f7b5f0adf3ae10f2cab5b9", - "version" : "0.25.2" + "revision" : "006528836875aed1f46ba8c95acf0983e6b22b12", + "version" : "0.30.0-fork.1" } }, { diff --git a/Package.swift b/Package.swift index 35b5f66f..0b9ca1ef 100644 --- a/Package.swift +++ b/Package.swift @@ -33,7 +33,7 @@ let package = Package( .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"), .package( url: "https://github.com/doozMen/swift-structured-queries", - from: "0.25.2", + exact: "0.30.0-fork.1", traits: [ .trait( name: "StructuredQueriesTagged", @@ -67,6 +67,8 @@ let package = Package( "SQLiteData", .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), .product(name: "CustomDump", package: "swift-custom-dump"), + .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"), + .product(name: "StructuredQueriesTestSupport", package: "swift-structured-queries"), ] ), .testTarget(