diff --git a/.swift-version b/.swift-version index 7d5c902e..bf77d549 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.1 +4.2 diff --git a/Package.resolved b/Package.resolved index 0df7272c..873b00f7 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,17 +6,17 @@ "repositoryURL": "https://github.com/vapor/core.git", "state": { "branch": null, - "revision": "3b72f2cc3fb21d505fbe97215418951a8e4a2871", - "version": "3.2.1" + "revision": "7f56a09995bf3c8df562be456bdcda405d9d0678", + "version": "3.4.1" } }, { "package": "Runtime", "repositoryURL": "https://github.com/wickwirew/Runtime.git", "state": { - "branch": null, - "revision": "23357609f0df427d870bb4bd22ac14e0a4ea1346", - "version": "0.7.1" + "branch": "swift42", + "revision": "a34cd8f9a1e76e0d0c32f47abae49d6134830825", + "version": null } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "77dc77b9b5cdddfb3c385c5ee6cb74153d284967", - "version": "1.7.2" + "revision": "c6acf77fc9a310c0ebf8d5f73f285d1639801d2f", + "version": "1.9.0" } }, { diff --git a/Package.swift b/Package.swift index 0ac09520..2dd78244 100644 --- a/Package.swift +++ b/Package.swift @@ -9,10 +9,10 @@ let package = Package( ], dependencies: [ - .package(url: "https://github.com/wickwirew/Runtime.git", from: "0.6.0"), + .package(url: "https://github.com/wickwirew/Runtime.git", .branch("swift42")), // ⏱ Promises and reactive-streams in Swift built for high-performance and scalability. - .package(url: "https://github.com/vapor/core.git", from: "3.0.0"), + .package(url: "https://github.com/vapor/core.git", from: "3.4.4"), ], targets: [ diff --git a/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift b/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift index 7502f1db..bd742d19 100644 --- a/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift +++ b/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift @@ -180,7 +180,7 @@ class FieldExecutionStrategyTests: XCTestCase { } func testSerialFieldExecutionStrategyWithSingleField() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -196,7 +196,7 @@ class FieldExecutionStrategyTests: XCTestCase { } func testSerialFieldExecutionStrategyWithSingleFieldError() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -212,7 +212,7 @@ class FieldExecutionStrategyTests: XCTestCase { } func testSerialFieldExecutionStrategyWithMultipleFields() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -228,7 +228,7 @@ class FieldExecutionStrategyTests: XCTestCase { } func testSerialFieldExecutionStrategyWithMultipleFieldErrors() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -249,7 +249,7 @@ class FieldExecutionStrategyTests: XCTestCase { } func testConcurrentDispatchFieldExecutionStrategyWithSingleField() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -265,7 +265,7 @@ class FieldExecutionStrategyTests: XCTestCase { } func testConcurrentDispatchFieldExecutionStrategyWithSingleFieldError() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -281,7 +281,7 @@ class FieldExecutionStrategyTests: XCTestCase { } func testConcurrentDispatchFieldExecutionStrategyWithMultipleFields() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -297,7 +297,7 @@ class FieldExecutionStrategyTests: XCTestCase { } func testConcurrentDispatchFieldExecutionStrategyWithMultipleFieldErrors() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } diff --git a/Tests/GraphQLTests/HelloWorldTests/HelloWorldTests.swift b/Tests/GraphQLTests/HelloWorldTests/HelloWorldTests.swift index 7c532db8..0953b4ac 100644 --- a/Tests/GraphQLTests/HelloWorldTests/HelloWorldTests.swift +++ b/Tests/GraphQLTests/HelloWorldTests/HelloWorldTests.swift @@ -16,7 +16,7 @@ class HelloWorldTests : XCTestCase { ) func testHello() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -33,7 +33,7 @@ class HelloWorldTests : XCTestCase { } func testBoyhowdy() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } diff --git a/Tests/GraphQLTests/StarWarsTests/StarWarsIntrospectionTests.swift b/Tests/GraphQLTests/StarWarsTests/StarWarsIntrospectionTests.swift index 03f3b36a..d4b0f22c 100644 --- a/Tests/GraphQLTests/StarWarsTests/StarWarsIntrospectionTests.swift +++ b/Tests/GraphQLTests/StarWarsTests/StarWarsIntrospectionTests.swift @@ -5,7 +5,7 @@ import NIO class StarWarsIntrospectionTests : XCTestCase { func testIntrospectionTypeQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -137,7 +137,7 @@ class StarWarsIntrospectionTests : XCTestCase { } func testIntrospectionQueryTypeQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -165,7 +165,7 @@ class StarWarsIntrospectionTests : XCTestCase { } func testIntrospectionDroidTypeQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -189,7 +189,7 @@ class StarWarsIntrospectionTests : XCTestCase { } func testIntrospectionDroidKindQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -215,7 +215,7 @@ class StarWarsIntrospectionTests : XCTestCase { } func testIntrospectionCharacterKindQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -241,7 +241,7 @@ class StarWarsIntrospectionTests : XCTestCase { } func testIntrospectionDroidFieldsQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -316,7 +316,7 @@ class StarWarsIntrospectionTests : XCTestCase { } func testIntrospectionDroidNestedFieldsQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -410,7 +410,7 @@ class StarWarsIntrospectionTests : XCTestCase { } func testIntrospectionFieldArgsQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -505,7 +505,7 @@ class StarWarsIntrospectionTests : XCTestCase { } func testIntrospectionDroidDescriptionQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } diff --git a/Tests/GraphQLTests/StarWarsTests/StarWarsQueryTests.swift b/Tests/GraphQLTests/StarWarsTests/StarWarsQueryTests.swift index 11df23a2..389db02e 100644 --- a/Tests/GraphQLTests/StarWarsTests/StarWarsQueryTests.swift +++ b/Tests/GraphQLTests/StarWarsTests/StarWarsQueryTests.swift @@ -5,7 +5,7 @@ import NIO class StarWarsQueryTests : XCTestCase { func testHeroNameQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -29,7 +29,7 @@ class StarWarsQueryTests : XCTestCase { } func testHeroNameAndFriendsQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -63,7 +63,7 @@ class StarWarsQueryTests : XCTestCase { } func testNestedQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -125,7 +125,7 @@ class StarWarsQueryTests : XCTestCase { } func testFetchLukeQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -149,7 +149,7 @@ class StarWarsQueryTests : XCTestCase { } func testOptionalVariable() throws{ - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -196,7 +196,7 @@ class StarWarsQueryTests : XCTestCase { } func testFetchSomeIDQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -257,7 +257,7 @@ class StarWarsQueryTests : XCTestCase { } func testFetchLukeAliasedQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -281,7 +281,7 @@ class StarWarsQueryTests : XCTestCase { } func testFetchLukeAndLeiaAliasedQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -311,7 +311,7 @@ class StarWarsQueryTests : XCTestCase { } func testDuplicateFieldsQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -345,7 +345,7 @@ class StarWarsQueryTests : XCTestCase { } func testUseFragmentQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -381,7 +381,7 @@ class StarWarsQueryTests : XCTestCase { } func testCheckTypeOfR2Query() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -407,7 +407,7 @@ class StarWarsQueryTests : XCTestCase { } func testCheckTypeOfLukeQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -433,7 +433,7 @@ class StarWarsQueryTests : XCTestCase { } func testSecretBackstoryQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -466,7 +466,7 @@ class StarWarsQueryTests : XCTestCase { } func testSecretBackstoryListQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -525,7 +525,7 @@ class StarWarsQueryTests : XCTestCase { } func testSecretBackstoryAliasQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) } @@ -558,7 +558,7 @@ class StarWarsQueryTests : XCTestCase { } func testNonNullableFieldsQuery() throws { - let eventLoopGroup = MultiThreadedEventLoopGroup(numThreads: 1) + let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) }