From da2cf2963c58b62fcf7ec097efda98ccb6ceba05 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Sun, 15 Jun 2025 08:50:55 -0700 Subject: [PATCH 1/2] Remove trailing comma while we support Swift 6.0 --- Sources/StructuredQueriesCore/Internal/Deprecations.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/StructuredQueriesCore/Internal/Deprecations.swift b/Sources/StructuredQueriesCore/Internal/Deprecations.swift index 8dc54d96..6648ec88 100644 --- a/Sources/StructuredQueriesCore/Internal/Deprecations.swift +++ b/Sources/StructuredQueriesCore/Internal/Deprecations.swift @@ -53,7 +53,7 @@ extension Table { or conflictResolution: ConflictResolution? = nil, _ columns: (TableColumns) -> (TableColumn, repeat TableColumn), select selection: () -> Select<(C1, repeat each C2), From, Joins>, - onConflict updates: ((inout Updates) -> Void)?, + onConflict updates: ((inout Updates) -> Void)? ) -> InsertOf where C1.QueryValue == V1, (repeat (each C2).QueryValue) == (repeat each V2) { insert(or: conflictResolution, columns, select: selection, onConflictDoUpdate: updates) From 9f323c5f0ce7dbf30c0ca34b13ebfeb68516a9e6 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Sun, 15 Jun 2025 08:51:44 -0700 Subject: [PATCH 2/2] compile for swift 6.0 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5727296..70ba6966 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,7 @@ jobs: strategy: matrix: swift: + - '6.0' - '6.1' runs-on: ubuntu-latest container: swift:${{ matrix.swift }}