From 6eece99ed209732ce858e69a601c38818f08f9f8 Mon Sep 17 00:00:00 2001 From: Jay Herron Date: Sat, 21 Sep 2024 09:09:31 -0600 Subject: [PATCH 1/3] chore: Fixes swift 6 warnings --- Sources/GraphQL/Map/Map.swift | 2 +- .../SubscriptionTests/SubscriptionTests.swift | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Sources/GraphQL/Map/Map.swift b/Sources/GraphQL/Map/Map.swift index 84ca2d21..1672c4b1 100644 --- a/Sources/GraphQL/Map/Map.swift +++ b/Sources/GraphQL/Map/Map.swift @@ -600,7 +600,7 @@ public extension Map { } } -extension String: CodingKey { +extension String: @retroactive CodingKey { public var stringValue: String { return self } diff --git a/Tests/GraphQLTests/SubscriptionTests/SubscriptionTests.swift b/Tests/GraphQLTests/SubscriptionTests/SubscriptionTests.swift index 5ae2e781..3214d3fa 100644 --- a/Tests/GraphQLTests/SubscriptionTests/SubscriptionTests.swift +++ b/Tests/GraphQLTests/SubscriptionTests/SubscriptionTests.swift @@ -655,7 +655,7 @@ import XCTest ]] ) ) - wait(for: [expectation], timeout: timeoutDuration) + await fulfillment(of: [expectation], timeout: timeoutDuration) XCTAssertEqual(results, expected) // Low priority email shouldn't trigger an event @@ -668,7 +668,7 @@ import XCTest unread: true, priority: 2 )) - wait(for: [expectation], timeout: timeoutDuration) + await fulfillment(of: [expectation], timeout: timeoutDuration) XCTAssertEqual(results, expected) // Higher priority one should trigger again @@ -694,7 +694,7 @@ import XCTest ]] ) ) - wait(for: [expectation], timeout: timeoutDuration) + await fulfillment(of: [expectation], timeout: timeoutDuration) XCTAssertEqual(results, expected) // So that the Task won't immediately be cancelled since the ConcurrentEventStream is @@ -756,7 +756,7 @@ import XCTest ]] ) ) - wait(for: [expectation], timeout: timeoutDuration) + await fulfillment(of: [expectation], timeout: timeoutDuration) XCTAssertEqual(results, expected) db.stop() @@ -772,7 +772,7 @@ import XCTest )) // Ensure that the current result was the one before the db was stopped - wait(for: [expectation], timeout: timeoutDuration) + await fulfillment(of: [expectation], timeout: timeoutDuration) XCTAssertEqual(results, expected) // So that the Task won't immediately be cancelled since the ConcurrentEventStream is @@ -919,7 +919,7 @@ import XCTest ]] ) ) - wait(for: [expectation], timeout: timeoutDuration) + await fulfillment(of: [expectation], timeout: timeoutDuration) XCTAssertEqual(results, expected) expectation = XCTestExpectation() @@ -938,7 +938,7 @@ import XCTest ] ) ) - wait(for: [expectation], timeout: timeoutDuration) + await fulfillment(of: [expectation], timeout: timeoutDuration) XCTAssertEqual(results, expected) expectation = XCTestExpectation() @@ -959,7 +959,7 @@ import XCTest ]] ) ) - wait(for: [expectation], timeout: timeoutDuration) + await fulfillment(of: [expectation], timeout: timeoutDuration) XCTAssertEqual(results, expected) // So that the Task won't immediately be cancelled since the ConcurrentEventStream is From 1f761df57919b24a0c01c36a80ae2e20776b8595 Mon Sep 17 00:00:00 2001 From: Jay Herron Date: Sat, 21 Sep 2024 09:10:19 -0600 Subject: [PATCH 2/3] chore: gitignores vscode --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f10a07cf..2a350963 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,8 @@ .swiftpm/ ### CI Artifacts ### -/.test-coverage \ No newline at end of file +/.test-coverage + +# VS Code +.vscode/ + From 171c5c31e3a5c2a5c4f274005ccbc25fa070aada Mon Sep 17 00:00:00 2001 From: Jay Herron Date: Sat, 21 Sep 2024 09:18:41 -0600 Subject: [PATCH 3/3] ci: Adds 6.0 to test matrix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 956e39ed..58199a5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - swift: ["5.7", "5.8", "5.9", "5.10"] + swift: ["5.7", "5.8", "5.9", "5.10", "6.0"] steps: - uses: swift-actions/setup-swift@v2 with: