diff --git a/Package.swift b/Package.swift index 5009ce65..814aa2bf 100644 --- a/Package.swift +++ b/Package.swift @@ -49,14 +49,14 @@ let package = Package( .target( name: "StructuredQueriesCore", dependencies: [ - "StructuredQueriesSupport", .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), .product( name: "Tagged", package: "swift-tagged", condition: .when(traits: ["StructuredQueriesTagged"]) ), - ] + ], + exclude: ["Symbolic Links/README.md"] ), .target( name: "StructuredQueries", @@ -68,10 +68,10 @@ let package = Package( .macro( name: "StructuredQueriesMacros", dependencies: [ - "StructuredQueriesSupport", .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), - ] + ], + exclude: ["Symbolic Links/README.md"] ), .target( name: "StructuredQueriesSQLite", @@ -107,8 +107,6 @@ let package = Package( .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"), ] ), - - .target(name: "StructuredQueriesSupport"), ], swiftLanguageModes: [.v6] ) diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift index 94af9029..ea9e718c 100644 --- a/Package@swift-6.0.swift +++ b/Package@swift-6.0.swift @@ -41,9 +41,9 @@ let package = Package( .target( name: "StructuredQueriesCore", dependencies: [ - "StructuredQueriesSupport", .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), - ] + ], + exclude: ["Symbolic Links/README.md"] ), .target( name: "StructuredQueries", @@ -55,10 +55,10 @@ let package = Package( .macro( name: "StructuredQueriesMacros", dependencies: [ - "StructuredQueriesSupport", .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), - ] + ], + exclude: ["Symbolic Links/README.md"] ), .target( name: "StructuredQueriesSQLite", @@ -94,8 +94,6 @@ let package = Package( .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"), ] ), - - .target(name: "StructuredQueriesSupport"), ], swiftLanguageModes: [.v6] ) diff --git a/Sources/StructuredQueriesCore/Exports.swift b/Sources/StructuredQueriesCore/Exports.swift deleted file mode 100644 index 8b5c4d2b..00000000 --- a/Sources/StructuredQueriesCore/Exports.swift +++ /dev/null @@ -1 +0,0 @@ -@_exported import StructuredQueriesSupport diff --git a/Sources/StructuredQueriesCore/QueryBinding.swift b/Sources/StructuredQueriesCore/QueryBinding.swift index 8999dcfa..cfd2befd 100644 --- a/Sources/StructuredQueriesCore/QueryBinding.swift +++ b/Sources/StructuredQueriesCore/QueryBinding.swift @@ -1,5 +1,4 @@ import Foundation -import StructuredQueriesSupport /// A type that enumerates the values that can be bound to the parameters of a SQL statement. public enum QueryBinding: Hashable, Sendable { diff --git a/Sources/StructuredQueriesCore/QueryFragment.swift b/Sources/StructuredQueriesCore/QueryFragment.swift index 4b726c02..d44231ed 100644 --- a/Sources/StructuredQueriesCore/QueryFragment.swift +++ b/Sources/StructuredQueriesCore/QueryFragment.swift @@ -1,5 +1,3 @@ -import StructuredQueriesSupport - /// A type representing a SQL string and its bindings. /// /// You will typically create instances of this type using string literals, where bindings are diff --git a/Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift b/Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift index e3984b64..93129871 100644 --- a/Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift +++ b/Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift @@ -1,5 +1,4 @@ import Foundation -import StructuredQueriesSupport extension QueryExpression { /// Passes this expression and the given one to the `json_patch` function. diff --git a/Sources/StructuredQueriesCore/Symbolic Links/README.md b/Sources/StructuredQueriesCore/Symbolic Links/README.md new file mode 100644 index 00000000..dc39f9bf --- /dev/null +++ b/Sources/StructuredQueriesCore/Symbolic Links/README.md @@ -0,0 +1,5 @@ +# Symbolic Links + +This directory contains symbolic links to shared source code used +by the StructuredQueriesCore target. This is a workaround until +SwiftPM has native support for sharing code between macros and targets. \ No newline at end of file diff --git a/Sources/StructuredQueriesCore/Symbolic Links/StructuredQueriesSupport b/Sources/StructuredQueriesCore/Symbolic Links/StructuredQueriesSupport new file mode 120000 index 00000000..43ecd203 --- /dev/null +++ b/Sources/StructuredQueriesCore/Symbolic Links/StructuredQueriesSupport @@ -0,0 +1 @@ +../../StructuredQueriesSupport \ No newline at end of file diff --git a/Sources/StructuredQueriesCore/TableAlias.swift b/Sources/StructuredQueriesCore/TableAlias.swift index b76bdec2..96530c0d 100644 --- a/Sources/StructuredQueriesCore/TableAlias.swift +++ b/Sources/StructuredQueriesCore/TableAlias.swift @@ -1,5 +1,4 @@ import Foundation -import StructuredQueriesSupport /// A type identifying a table alias. /// diff --git a/Sources/StructuredQueriesMacros/SelectionMacro.swift b/Sources/StructuredQueriesMacros/SelectionMacro.swift index 15f05ae0..f57844e7 100644 --- a/Sources/StructuredQueriesMacros/SelectionMacro.swift +++ b/Sources/StructuredQueriesMacros/SelectionMacro.swift @@ -1,4 +1,3 @@ -import StructuredQueriesSupport import SwiftBasicFormat import SwiftDiagnostics import SwiftSyntax diff --git a/Sources/StructuredQueriesMacros/Symbolic Links/README.md b/Sources/StructuredQueriesMacros/Symbolic Links/README.md new file mode 100644 index 00000000..93da8d97 --- /dev/null +++ b/Sources/StructuredQueriesMacros/Symbolic Links/README.md @@ -0,0 +1,5 @@ +# Symbolic Links + +This directory contains symbolic links to shared source code used +by the StructuredQueries macros. This is a workaround until SwiftPM +has native support for sharing code between macros and targets. \ No newline at end of file diff --git a/Sources/StructuredQueriesMacros/Symbolic Links/StructuredQueriesSupport b/Sources/StructuredQueriesMacros/Symbolic Links/StructuredQueriesSupport new file mode 120000 index 00000000..43ecd203 --- /dev/null +++ b/Sources/StructuredQueriesMacros/Symbolic Links/StructuredQueriesSupport @@ -0,0 +1 @@ +../../StructuredQueriesSupport \ No newline at end of file diff --git a/Sources/StructuredQueriesMacros/TableMacro.swift b/Sources/StructuredQueriesMacros/TableMacro.swift index f0ac0afc..f4f720ea 100644 --- a/Sources/StructuredQueriesMacros/TableMacro.swift +++ b/Sources/StructuredQueriesMacros/TableMacro.swift @@ -1,4 +1,3 @@ -import StructuredQueriesSupport import SwiftBasicFormat import SwiftDiagnostics import SwiftSyntax diff --git a/Tests/StructuredQueriesTests/InflectionTests.swift b/Tests/StructuredQueriesTests/InflectionTests.swift index 10858dc0..c549be8a 100644 --- a/Tests/StructuredQueriesTests/InflectionTests.swift +++ b/Tests/StructuredQueriesTests/InflectionTests.swift @@ -1,4 +1,4 @@ -import StructuredQueriesSupport +import StructuredQueriesCore import Testing @Suite struct InflectionTests {