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/.travis.yml b/.travis.yml index 0873bc8e..82e6e506 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: include: - os: osx env: JOB=SwiftPM_OSX - osx_image: xcode9.3beta + osx_image: xcode10.1 - os: linux env: JOB=SwiftPM_linux dist: trusty diff --git a/Package.resolved b/Package.resolved index 0df7272c..e6a72772 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,17 @@ "repositoryURL": "https://github.com/vapor/core.git", "state": { "branch": null, - "revision": "3b72f2cc3fb21d505fbe97215418951a8e4a2871", - "version": "3.2.1" + "revision": "1794ff138bd669175a2528d27695028d7cb30471", + "version": "3.5.0" + } + }, + { + "package": "CRuntime", + "repositoryURL": "https://github.com/wickwirew/CRuntime.git", + "state": { + "branch": null, + "revision": "8d0dd0ca3787d15682c1f44de3d298459870b121", + "version": "1.0.0" } }, { @@ -15,8 +24,8 @@ "repositoryURL": "https://github.com/wickwirew/Runtime.git", "state": { "branch": null, - "revision": "23357609f0df427d870bb4bd22ac14e0a4ea1346", - "version": "0.7.1" + "revision": "40cdfbad9650512507c060824e1c4e9fc2ca721d", + "version": "1.1.0" } }, { @@ -24,8 +33,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "77dc77b9b5cdddfb3c385c5ee6cb74153d284967", - "version": "1.7.2" + "revision": "03c541a24dd0558c942b15d8464eb75d70a921c4", + "version": "1.12.1" } }, { diff --git a/Package.swift b/Package.swift index 0ac09520..2c1da90f 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( ], dependencies: [ - .package(url: "https://github.com/wickwirew/Runtime.git", from: "0.6.0"), + .package(url: "https://github.com/wickwirew/Runtime.git", from: "1.1.0"), // ⏱ Promises and reactive-streams in Swift built for high-performance and scalability. .package(url: "https://github.com/vapor/core.git", from: "3.0.0"), diff --git a/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift b/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift index 7502f1db..2da99639 100644 --- a/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift +++ b/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift @@ -76,7 +76,7 @@ class FieldExecutionStrategyTests: XCTestCase { "locations": [ ["column": 3, "line": 1] ], - "message": "exampleError(\"bang: bang\")", + "message": "exampleError(msg: \"bang: bang\")", "path":["bang"] ] ] @@ -100,70 +100,70 @@ class FieldExecutionStrategyTests: XCTestCase { "locations": [ ["column": 3, "line": 1] ], - "message": "exampleError(\"bang: a\")", + "message": "exampleError(msg: \"bang: a\")", "path":["a"] ], [ "locations": [ ["column": 11, "line": 1] ], - "message": "exampleError(\"bang: b\")", + "message": "exampleError(msg: \"bang: b\")", "path":["b"] ], [ "locations": [ ["column": 19, "line": 1] ], - "message": "exampleError(\"bang: c\")", + "message": "exampleError(msg: \"bang: c\")", "path":["c"] ], [ "locations": [ ["column": 27, "line": 1] ], - "message": "exampleError(\"bang: d\")", + "message": "exampleError(msg: \"bang: d\")", "path":["d"] ], [ "locations": [ ["column": 35, "line": 1] ], - "message": "exampleError(\"bang: e\")", + "message": "exampleError(msg: \"bang: e\")", "path":["e"] ], [ "locations": [ ["column": 43, "line": 1] ], - "message": "exampleError(\"bang: f\")", + "message": "exampleError(msg: \"bang: f\")", "path":["f"] ], [ "locations": [ ["column": 51, "line": 1] ], - "message": "exampleError(\"bang: g\")", + "message": "exampleError(msg: \"bang: g\")", "path":["g"] ], [ "locations": [ ["column": 59, "line": 1] ], - "message": "exampleError(\"bang: h\")", + "message": "exampleError(msg: \"bang: h\")", "path":["h"] ], [ "locations": [ ["column": 67, "line": 1] ], - "message": "exampleError(\"bang: i\")", + "message": "exampleError(msg: \"bang: i\")", "path":["i"] ], [ "locations": [ ["column": 75, "line": 1] ], - "message": "exampleError(\"bang: j\")", + "message": "exampleError(msg: \"bang: j\")", "path":["j"] ], ] diff --git a/Tests/GraphQLTests/StarWarsTests/StarWarsIntrospectionTests.swift b/Tests/GraphQLTests/StarWarsTests/StarWarsIntrospectionTests.swift index 03f3b36a..ff3c938e 100644 --- a/Tests/GraphQLTests/StarWarsTests/StarWarsIntrospectionTests.swift +++ b/Tests/GraphQLTests/StarWarsTests/StarWarsIntrospectionTests.swift @@ -19,7 +19,6 @@ class StarWarsIntrospectionTests : XCTestCase { " }" + "}" - #if os(macOS) let expected: Map = [ "data": [ "__schema": [ @@ -73,61 +72,6 @@ class StarWarsIntrospectionTests : XCTestCase { ], ], ] - #else - let expected: Map = [ - "data": [ - "__schema": [ - "types": [ - [ - "name": "__Directive", - ], - [ - "name": "__DirectiveLocation", - ], - [ - "name": "__EnumValue", - ], - [ - "name": "__Field", - ], - [ - "name": "__InputValue", - ], - [ - "name": "__Schema", - ], - [ - "name": "__Type", - ], - [ - "name": "__TypeKind", - ], - [ - "name": "Boolean", - ], - [ - "name": "Character", - ], - [ - "name": "Droid", - ], - [ - "name": "Episode", - ], - [ - "name": "Human", - ], - [ - "name": "Query", - ], - [ - "name": "String", - ], - ], - ], - ], - ] - #endif let result = try graphql(schema: StarWarsSchema, request: query, eventLoopGroup: eventLoopGroup).wait() XCTAssertEqual(result, expected)