From 3221d53f251fb7f785553259fe798e80e467e245 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Thu, 9 Jul 2026 13:54:38 -0700 Subject: [PATCH 1/2] Bump to IssueReporting 2.0 --- Package.resolved | 11 ++++++++++- Package.swift | 4 ++-- Package@swift-6.0.swift | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Package.resolved b/Package.resolved index b0538ea6..6d12bf59 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "e2cc6c054d5cb45b58ddae48858b3338ce4fc9283457edb40b284849c3914ed5", + "originHash" : "27f15db58518541503551186d647902c85a008abab56a9a40c5d5d65a520c139", "pins" : [ { "identity" : "combine-schedulers", @@ -91,6 +91,15 @@ "version" : "1.1.1" } }, + { + "identity" : "swift-issue-reporting", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-issue-reporting", + "state" : { + "revision" : "d6adc8bc81e8ba37d3ecd094b78450853738a89f", + "version" : "2.0.0" + } + }, { "identity" : "swift-perception", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index 837ac528..9f3c3253 100644 --- a/Package.swift +++ b/Package.swift @@ -42,6 +42,7 @@ let package = Package( .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.4.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"), + .package(url: "https://github.com/pointfreeco/swift-issue-reporting", from: "2.0.0"), .package(url: "https://github.com/pointfreeco/swift-perception", from: "2.0.0"), .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"), .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"), @@ -54,7 +55,6 @@ let package = Package( ] ), .package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.10.0"), - .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"), ], targets: [ .target( @@ -63,7 +63,7 @@ let package = Package( .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), .product(name: "Dependencies", package: "swift-dependencies"), .product(name: "GRDB", package: "GRDB.swift"), - .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), + .product(name: "IssueReporting", package: "swift-issue-reporting"), .product(name: "OrderedCollections", package: "swift-collections"), .product(name: "Perception", package: "swift-perception"), .product(name: "Sharing", package: "swift-sharing"), diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift index 66138923..9fc980e8 100644 --- a/Package@swift-6.0.swift +++ b/Package@swift-6.0.swift @@ -26,10 +26,10 @@ let package = Package( .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"), + .package(url: "https://github.com/pointfreeco/swift-issue-reporting", from: "2.0.0"), .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"), .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"), .package(url: "https://github.com/pointfreeco/swift-structured-queries", from: "0.31.0"), - .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"), ], targets: [ .target( @@ -38,7 +38,7 @@ let package = Package( .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), .product(name: "Dependencies", package: "swift-dependencies"), .product(name: "GRDB", package: "GRDB.swift"), - .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), + .product(name: "IssueReporting", package: "swift-issue-reporting"), .product(name: "OrderedCollections", package: "swift-collections"), .product(name: "Sharing", package: "swift-sharing"), .product(name: "StructuredQueriesSQLite", package: "swift-structured-queries"), From ad7a8f67875fb1490d6d8be1a1809570e5f0264b Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Thu, 27 Aug 2026 12:55:56 -0700 Subject: [PATCH 2/2] wip --- Package.resolved | 10 +-- Package.swift | 12 ++-- Package@swift-6.0.swift | 4 +- Package@swift-6.1.swift | 134 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+), 13 deletions(-) create mode 100644 Package@swift-6.1.swift diff --git a/Package.resolved b/Package.resolved index 6d12bf59..59b11bd7 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "27f15db58518541503551186d647902c85a008abab56a9a40c5d5d65a520c139", + "originHash" : "c8379cb94964ea9630d0397b7bf7542c646a9286d33970753850761ddeac6ec2", "pins" : [ { "identity" : "combine-schedulers", @@ -96,8 +96,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-issue-reporting", "state" : { - "revision" : "d6adc8bc81e8ba37d3ecd094b78450853738a89f", - "version" : "2.0.0" + "revision" : "71c7c9a761d1ca6ed4ccb6ced040fe1c1a39e8e7", + "version" : "2.1.0" } }, { @@ -150,8 +150,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "cb281f343fd953280336dcbd3822cdf47c182f5b", - "version" : "1.10.0" + "revision" : "7bbd97af585672a3dcdf6575ad37b339ad41b579", + "version" : "1.13.0" } } ], diff --git a/Package.swift b/Package.swift index 9f3c3253..12d39901 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 6.1 +// swift-tools-version: 6.4 import Foundation import PackageDescription @@ -6,10 +6,10 @@ import PackageDescription let package = Package( name: "sqlite-data", platforms: [ - .iOS(.v13), - .macOS(.v10_15), - .tvOS(.v13), - .watchOS(.v7), + .iOS(.v15), + .macOS(.v12), + .tvOS(.v15), + .watchOS(.v9), ], products: [ .library( @@ -42,7 +42,7 @@ let package = Package( .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.4.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"), - .package(url: "https://github.com/pointfreeco/swift-issue-reporting", from: "2.0.0"), + .package(url: "https://github.com/pointfreeco/swift-issue-reporting", from: "2.1.0"), .package(url: "https://github.com/pointfreeco/swift-perception", from: "2.0.0"), .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"), .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"), diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift index 9fc980e8..371ba8c9 100644 --- a/Package@swift-6.0.swift +++ b/Package@swift-6.0.swift @@ -26,7 +26,7 @@ let package = Package( .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"), - .package(url: "https://github.com/pointfreeco/swift-issue-reporting", from: "2.0.0"), + .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.13.0"), .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"), .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"), .package(url: "https://github.com/pointfreeco/swift-structured-queries", from: "0.31.0"), @@ -38,7 +38,7 @@ let package = Package( .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), .product(name: "Dependencies", package: "swift-dependencies"), .product(name: "GRDB", package: "GRDB.swift"), - .product(name: "IssueReporting", package: "swift-issue-reporting"), + .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), .product(name: "OrderedCollections", package: "swift-collections"), .product(name: "Sharing", package: "swift-sharing"), .product(name: "StructuredQueriesSQLite", package: "swift-structured-queries"), diff --git a/Package@swift-6.1.swift b/Package@swift-6.1.swift new file mode 100644 index 00000000..911beb41 --- /dev/null +++ b/Package@swift-6.1.swift @@ -0,0 +1,134 @@ +// swift-tools-version: 6.1 + +import Foundation +import PackageDescription + +let package = Package( + name: "sqlite-data", + platforms: [ + .iOS(.v13), + .macOS(.v10_15), + .tvOS(.v13), + .watchOS(.v7), + ], + products: [ + .library( + name: "SQLiteData", + targets: ["SQLiteData"] + ), + .library( + name: "SQLiteDataTestSupport", + targets: ["SQLiteDataTestSupport"] + ), + ], + traits: [ + .trait( + name: "CasePaths", + description: "Introduce support for enum tables." + ), + .trait( + name: "Tagged", + description: "Introduce SQLiteData conformances to the swift-tagged package." + ), + .trait( + name: "SQLiteDataTagged", + description: "A deprecated alias for the 'Tagged' trait.", + enabledTraits: ["Tagged"] + ), + ], + dependencies: [ + .package(url: "https://github.com/apple/swift-collections", from: "1.0.0"), + .package(url: "https://github.com/groue/GRDB.swift", from: "7.6.0"), + .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.4.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"), + .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.13.0"), + .package(url: "https://github.com/pointfreeco/swift-perception", from: "2.0.0"), + .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"), + .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"), + .package( + url: "https://github.com/pointfreeco/swift-structured-queries", + from: "0.32.0", + traits: [ + .trait(name: "CasePaths", condition: .when(traits: ["CasePaths"])), + .trait(name: "Tagged", condition: .when(traits: ["Tagged"])), + ] + ), + .package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.10.0"), + ], + targets: [ + .target( + name: "SQLiteData", + dependencies: [ + .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), + .product(name: "Dependencies", package: "swift-dependencies"), + .product(name: "GRDB", package: "GRDB.swift"), + .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), + .product(name: "OrderedCollections", package: "swift-collections"), + .product(name: "Perception", package: "swift-perception"), + .product(name: "Sharing", package: "swift-sharing"), + .product(name: "StructuredQueriesSQLite", package: "swift-structured-queries"), + .product( + name: "Tagged", + package: "swift-tagged", + condition: .when(traits: ["Tagged"]) + ), + ] + ), + .target( + name: "SQLiteDataTestSupport", + dependencies: [ + "SQLiteData", + .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), + .product(name: "ConcurrencyExtrasTestSupport", package: "swift-concurrency-extras"), + .product(name: "CustomDump", package: "swift-custom-dump"), + .product(name: "Dependencies", package: "swift-dependencies"), + .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"), + .product(name: "StructuredQueriesTestSupport", package: "swift-structured-queries"), + ] + ), + .testTarget( + name: "SQLiteDataTests", + dependencies: [ + "SQLiteData", + "SQLiteDataTestSupport", + "TestLocals", + .product(name: "DependenciesTestSupport", package: "swift-dependencies"), + .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"), + .product(name: "SnapshotTestingCustomDump", package: "swift-snapshot-testing"), + .product(name: "StructuredQueries", package: "swift-structured-queries"), + ] + ), + .target( + name: "TestLocals", + dependencies: ["SQLiteData"] + ), + ], + swiftLanguageModes: [.v6] +) + +for target in package.targets { + target.swiftSettings = target.swiftSettings ?? [] + target.swiftSettings?.append(contentsOf: [ + .enableUpcomingFeature("ExistentialAny"), + .enableUpcomingFeature("ImmutableWeakCaptures"), + .enableUpcomingFeature("InferIsolatedConformances"), + .enableUpcomingFeature("NonisolatedNonsendingByDefault"), + ]) + if target.type != .test { + target.swiftSettings?.append(contentsOf: [ + .enableUpcomingFeature("InternalImportsByDefault"), + .enableUpcomingFeature("MemberImportVisibility"), + ]) + if ProcessInfo.processInfo.environment.keys.contains("EXCLUDE_EXPORTS") { + target.swiftSettings?.append(.define("EXCLUDE_EXPORTS")) + } + } +} + +#if !os(Windows) + // Add the documentation compiler plugin if possible + package.dependencies.append( + .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0") + ) +#endif