Skip to content

Commit

Permalink
Merge pull request #17 from kimdv/master
Browse files Browse the repository at this point in the history
Introduce EventLoopFutures!
  • Loading branch information
paulofaria authored Jun 13, 2018
2 parents 85d7117 + 962cf8e commit 77cbd9f
Show file tree
Hide file tree
Showing 11 changed files with 398 additions and 234 deletions.
35 changes: 31 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -1,22 +1,49 @@
{
"object": {
"pins": [
{
"package": "Core",
"repositoryURL": "https://github.com/vapor/core.git",
"state": {
"branch": null,
"revision": "174f909bc048a6aff27d6cb4c31810971f912cca",
"version": "3.2.2"
}
},
{
"package": "GraphQL",
"repositoryURL": "https://github.com/GraphQLSwift/GraphQL.git",
"state": {
"branch": null,
"revision": "faa869cdf0214cf25aa8df1081891b5e8647d6df",
"version": "0.5.0"
"revision": "1ab3c9050cb0aea4350dbc343454bb8c83adff34",
"version": "0.6.0"
}
},
{
"package": "Runtime",
"repositoryURL": "https://github.com/wickwirew/Runtime.git",
"state": {
"branch": null,
"revision": "9f9e3078fff093adbd8f43df1052ee5d68b05c2a",
"version": "0.6.0"
"revision": "23357609f0df427d870bb4bd22ac14e0a4ea1346",
"version": "0.7.1"
}
},
{
"package": "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git",
"state": {
"branch": null,
"revision": "695afc5205aaa49fca092b94b479ff71c43d9d3c",
"version": "1.8.0"
}
},
{
"package": "swift-nio-zlib-support",
"repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
"state": {
"branch": null,
"revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
"version": "1.0.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let package = Package(
],

dependencies: [
.package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "0.5.0"),
.package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "0.6.0"),
],

targets: [
Expand Down
Loading

0 comments on commit 77cbd9f

Please sign in to comment.