Support Archiving for Mac Catalyst

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]
 )

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]
 )

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 {

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

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.

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.

Sources/StructuredQueriesCore/Symbolic Links/StructuredQueriesSupport

@@ -0,0 +1 @@
+../../StructuredQueriesSupport

Sources/StructuredQueriesCore/TableAlias.swift

@@ -1,5 +1,4 @@
 import Foundation
-import StructuredQueriesSupport
 
 /// A type identifying a table alias.
 ///

Sources/StructuredQueriesMacros/SelectionMacro.swift

@@ -1,4 +1,3 @@
-import StructuredQueriesSupport
 import SwiftBasicFormat
 import SwiftDiagnostics
 import SwiftSyntax

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.

Sources/StructuredQueriesMacros/Symbolic Links/StructuredQueriesSupport

@@ -0,0 +1 @@
+../../StructuredQueriesSupport

Sources/StructuredQueriesMacros/TableMacro.swift

@@ -1,4 +1,3 @@
-import StructuredQueriesSupport
 import SwiftBasicFormat
 import SwiftDiagnostics
 import SwiftSyntax

Tests/StructuredQueriesTests/InflectionTests.swift

@@ -1,4 +1,4 @@
-import StructuredQueriesSupport
+import StructuredQueriesCore
 import Testing
 
 @Suite struct InflectionTests {