Skip to content

Commit ebb2d34

Browse files
author
Stijn Willems
committed
wip local dependencies for structured queries
1 parent 656545a commit ebb2d34

6 files changed

Lines changed: 146 additions & 224 deletions

File tree

‎.claude/settings.local.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"permissions": {
3+
"allow": [
4+
"Bash(swift --version:*)",
5+
"Bash(~/.swiftly/bin/swiftly list:*)",
6+
"Bash(~/.swiftly/bin/swiftly use:*)"
7+
]
8+
}
9+
}

‎Package.resolved‎

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

‎Package.swift‎

Lines changed: 93 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,108 @@
1-
// swift-tools-version: 6.1
1+
// swift-tools-version: 6.2.1
22

33
import PackageDescription
44

55
let package = Package(
6-
name: "sqlite-data",
7-
platforms: [
8-
.macOS(.v15),
9-
],
10-
products: [
11-
.library(
12-
name: "SQLiteData",
13-
targets: ["SQLiteData"]
14-
),
15-
.library(
16-
name: "SQLiteDataTestSupport",
17-
targets: ["SQLiteDataTestSupport"]
18-
),
19-
],
20-
traits: [
21-
.trait(
22-
name: "SQLiteDataTagged",
23-
description: "Introduce SQLiteData conformances to the swift-tagged package."
24-
)
25-
],
26-
dependencies: [
27-
.package(url: "https://github.com/apple/swift-collections", from: "1.0.0"),
28-
.package(url: "https://github.com/groue/GRDB.swift", from: "7.6.0"),
29-
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
30-
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
31-
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"),
32-
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"),
33-
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),
34-
.package(
35-
url: "https://github.com/pointfreeco/swift-structured-queries",
36-
from: "0.24.0",
37-
traits: [
38-
.trait(name: "StructuredQueriesTagged", condition: .when(traits: ["SQLiteDataTagged"]))
39-
]
40-
),
41-
.package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.10.0"),
42-
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"),
43-
],
44-
targets: [
45-
.target(
46-
name: "SQLiteData",
47-
dependencies: [
48-
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
49-
.product(name: "Dependencies", package: "swift-dependencies"),
50-
.product(name: "GRDB", package: "GRDB.swift"),
51-
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
52-
.product(name: "OrderedCollections", package: "swift-collections"),
53-
.product(name: "Sharing", package: "swift-sharing"),
54-
.product(name: "StructuredQueriesSQLite", package: "swift-structured-queries"),
55-
.product(
56-
name: "Tagged",
57-
package: "swift-tagged",
58-
condition: .when(traits: ["SQLiteDataTagged"])
6+
name: "sqlite-data",
7+
platforms: [
8+
.macOS(.v26)
9+
],
10+
products: [
11+
.library(
12+
name: "SQLiteData",
13+
targets: ["SQLiteData"]
14+
),
15+
.library(
16+
name: "SQLiteDataTestSupport",
17+
targets: ["SQLiteDataTestSupport"]
18+
),
19+
],
20+
traits: [
21+
.trait(
22+
name: "SQLiteDataTagged",
23+
description: "Introduce SQLiteData conformances to the swift-tagged package."
24+
)
25+
],
26+
dependencies: [
27+
.package(url: "https://github.com/apple/swift-collections", from: "1.0.0"),
28+
.package(name: "GRDB.swift", path: "../GRDB-swift"),
29+
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
30+
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
31+
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"),
32+
.package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"),
33+
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),
34+
.package(
35+
path: "../swift-structured-queries",
36+
traits: [
37+
.trait(
38+
name: "StructuredQueriesTagged",
39+
condition: .when(traits: ["SQLiteDataTagged"]))
40+
]
41+
),
42+
.package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.10.0"),
43+
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"),
44+
],
45+
targets: [
46+
.target(
47+
name: "SQLiteData",
48+
dependencies: [
49+
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
50+
.product(name: "Dependencies", package: "swift-dependencies"),
51+
.product(name: "GRDB", package: "GRDB.swift"),
52+
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
53+
.product(name: "OrderedCollections", package: "swift-collections"),
54+
.product(name: "Sharing", package: "swift-sharing"),
55+
.product(name: "StructuredQueriesSQLite", package: "swift-structured-queries"),
56+
.product(
57+
name: "Tagged",
58+
package: "swift-tagged",
59+
condition: .when(traits: ["SQLiteDataTagged"])
60+
),
61+
]
5962
),
60-
]
61-
),
62-
.target(
63-
name: "SQLiteDataTestSupport",
64-
dependencies: [
65-
"SQLiteData",
66-
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
67-
.product(name: "CustomDump", package: "swift-custom-dump"),
68-
.product(name: "Dependencies", package: "swift-dependencies"),
69-
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
70-
.product(name: "StructuredQueriesTestSupport", package: "swift-structured-queries"),
71-
]
72-
),
73-
.testTarget(
74-
name: "SQLiteDataTests",
75-
dependencies: [
76-
"SQLiteData",
77-
"SQLiteDataTestSupport",
78-
.product(name: "DependenciesTestSupport", package: "swift-dependencies"),
79-
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
80-
.product(name: "SnapshotTestingCustomDump", package: "swift-snapshot-testing"),
81-
.product(name: "StructuredQueries", package: "swift-structured-queries"),
82-
]
83-
),
84-
],
85-
swiftLanguageModes: [.v6]
63+
.target(
64+
name: "SQLiteDataTestSupport",
65+
dependencies: [
66+
"SQLiteData",
67+
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
68+
.product(name: "CustomDump", package: "swift-custom-dump"),
69+
.product(name: "Dependencies", package: "swift-dependencies"),
70+
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
71+
.product(name: "StructuredQueriesTestSupport", package: "swift-structured-queries"),
72+
]
73+
),
74+
.testTarget(
75+
name: "SQLiteDataTests",
76+
dependencies: [
77+
"SQLiteData",
78+
"SQLiteDataTestSupport",
79+
.product(name: "DependenciesTestSupport", package: "swift-dependencies"),
80+
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
81+
.product(name: "SnapshotTestingCustomDump", package: "swift-snapshot-testing"),
82+
.product(name: "StructuredQueries", package: "swift-structured-queries"),
83+
]
84+
),
85+
],
86+
swiftLanguageModes: [.v6]
8687
)
8788

8889
let swiftSettings: [SwiftSetting] = [
89-
.enableUpcomingFeature("MemberImportVisibility")
90-
// .unsafeFlags([
91-
// "-Xfrontend",
92-
// "-warn-long-function-bodies=50",
93-
// "-Xfrontend",
94-
// "-warn-long-expression-type-checking=50",
95-
// ])
90+
.enableUpcomingFeature("MemberImportVisibility")
91+
// .unsafeFlags([
92+
// "-Xfrontend",
93+
// "-warn-long-function-bodies=50",
94+
// "-Xfrontend",
95+
// "-warn-long-expression-type-checking=50",
96+
// ])
9697
]
9798

9899
for index in package.targets.indices {
99-
package.targets[index].swiftSettings = swiftSettings
100+
package.targets[index].swiftSettings = swiftSettings
100101
}
101102

102103
#if !os(Windows)
103-
// Add the documentation compiler plugin if possible
104-
package.dependencies.append(
105-
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
106-
)
104+
// Add the documentation compiler plugin if possible
105+
package.dependencies.append(
106+
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
107+
)
107108
#endif

‎Package@swift-6.0.swift‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎Sources/SQLiteData/CloudKit/CloudKit+StructuredQueries.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284

285285
self.userModificationTime = other.userModificationTime
286286
for column in T.TableColumns.writableColumns {
287-
func open<Root, Value>(_ column: some WritableTableColumnExpression<Root, Value>) {
287+
func open<Value>(_ column: some WritableTableColumnExpression<T, Value>) {
288288
let key = column.name
289289
let keyPath = column.keyPath as! KeyPath<T, Value.QueryOutput>
290290
let didSet: Bool

0 commit comments

Comments
 (0)