Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ jobs:
- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
- name: Build ${{ matrix.config }} without exports
run: swift build -c ${{ matrix.config }} -Xswiftc -D -Xswiftc EXCLUDE_EXPORTS
env:
EXCLUDE_EXPORTS: true
run: swift build -c ${{ matrix.config }}
- name: Run ${{ matrix.config }} tests
run: swift test -c ${{ matrix.config }} --traits SQLiteDataTagged

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 19 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// swift-tools-version: 6.1

import Foundation
import PackageDescription

let package = Package(
Expand All @@ -22,9 +23,18 @@ let package = Package(
],
traits: [
.trait(
name: "SQLiteDataTagged",
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"),
Expand All @@ -37,9 +47,10 @@ let package = Package(
.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",
from: "0.32.0",
traits: [
.trait(name: "StructuredQueriesTagged", condition: .when(traits: ["SQLiteDataTagged"]))
.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"),
Expand All @@ -60,7 +71,7 @@ let package = Package(
.product(
name: "Tagged",
package: "swift-tagged",
condition: .when(traits: ["SQLiteDataTagged"])
condition: .when(traits: ["Tagged"])
),
]
),
Expand Down Expand Up @@ -108,6 +119,9 @@ for target in package.targets {
.enableUpcomingFeature("InternalImportsByDefault"),
.enableUpcomingFeature("MemberImportVisibility"),
])
if ProcessInfo.processInfo.environment.keys.contains("EXCLUDE_EXPORTS") {
target.swiftSettings?.append(.define("EXCLUDE_EXPORTS"))
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/SQLiteData/Traits/Tagged.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if SQLiteDataTagged
#if Tagged
public import Tagged

extension Tagged: IdentifierStringConvertible where RawValue: IdentifierStringConvertible {
Expand Down