diff --git a/Package.resolved b/Package.resolved index c161271d..2688f216 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "c23a65a671a050ad4a9a14e2506d4c5d127c928aa245e735949f4e4891331401", + "originHash" : "dfd941df32b6e1a408ad2bd62cd57ece4072d72fc8f72779088f839e6e97223e", "pins" : [ { "identity" : "combine-schedulers", @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-custom-dump", "state" : { - "revision" : "e9c34fd54ece006b491a0e6d23fe9a6024b9a828", - "version" : "1.7.0" + "revision" : "b46dda2b036983389d451d8b877c19378d4610df", + "version" : "1.7.1" } }, { @@ -60,8 +60,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-dependencies", "state" : { - "revision" : "8dc1fbf2f6255a73dec53b4648164884898db4c5", - "version" : "1.14.1" + "revision" : "5e0815746534ccaa9e20588ea35d3bb2cb27bab8", + "version" : "1.17.0" } }, { @@ -91,6 +91,15 @@ "version" : "1.1.1" } }, + { + "identity" : "swift-issue-reporting", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-issue-reporting", + "state" : { + "revision" : "71c7c9a761d1ca6ed4ccb6ced040fe1c1a39e8e7", + "version" : "2.1.0" + } + }, { "identity" : "swift-perception", "kind" : "remoteSourceControl", @@ -123,8 +132,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-structured-queries", "state" : { - "revision" : "8a733f414adc1224c5185c3a35c30ee1ef217171", - "version" : "0.36.0" + "revision" : "7cdc5c4514e24b1b828fd39f5b97badb7ffeaeae", + "version" : "0.37.0" } }, { @@ -141,8 +150,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "8f6abcf4c8950e2679d5b2fee4ca284fd7c34886", - "version" : "1.11.0" + "revision" : "7bbd97af585672a3dcdf6575ad37b339ad41b579", + "version" : "1.13.0" } } ], diff --git a/Package.swift b/Package.swift index 50115d26..7d5f4e02 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 @@ -64,6 +64,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.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"), @@ -85,7 +86,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( @@ -94,7 +94,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 104bbe35..b7246de3 100644 --- a/Package@swift-6.0.swift +++ b/Package@swift-6.0.swift @@ -29,7 +29,7 @@ let package = Package( .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.35.0"), - .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"), + .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.13.0"), ], targets: [ .target( diff --git a/Package@swift-6.1.swift b/Package@swift-6.1.swift new file mode 100644 index 00000000..744badc0 --- /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(.v16), + .macOS(.v13), + .tvOS(.v16), + .watchOS(.v9), + ], + 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/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"), + .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.13.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