Skip to content

Commit bfd6be4

Browse files
authored
Merge pull request #26 from noahemmet/swift-5
Update to Swift 5
2 parents 4525795 + 8d9c16d commit bfd6be4

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0

Package.resolved

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66
"repositoryURL": "https://github.com/vapor/core.git",
77
"state": {
88
"branch": null,
9-
"revision": "1794ff138bd669175a2528d27695028d7cb30471",
10-
"version": "3.5.0"
9+
"revision": "2731f8ba0cf274a61c9bd6ab43550f692ffaf879",
10+
"version": "3.9.0"
1111
}
1212
},
1313
{
1414
"package": "CRuntime",
1515
"repositoryURL": "https://github.com/wickwirew/CRuntime.git",
1616
"state": {
1717
"branch": null,
18-
"revision": "8d0dd0ca3787d15682c1f44de3d298459870b121",
19-
"version": "1.0.0"
18+
"revision": "95f911318d8c885f6fc05e971471f94adfd39405",
19+
"version": "2.1.2"
2020
}
2121
},
2222
{
2323
"package": "GraphQL",
2424
"repositoryURL": "https://github.com/GraphQLSwift/GraphQL.git",
2525
"state": {
2626
"branch": "master",
27-
"revision": "2ba73c3691dbcdeb6e09ad4f6df46536ba692c83",
27+
"revision": "1c9e24fa43f26826fc2d42d875f8fe611d25bf35",
2828
"version": null
2929
}
3030
},
@@ -33,17 +33,17 @@
3333
"repositoryURL": "https://github.com/wickwirew/Runtime.git",
3434
"state": {
3535
"branch": null,
36-
"revision": "40cdfbad9650512507c060824e1c4e9fc2ca721d",
37-
"version": "1.1.0"
36+
"revision": "c167476b07fe8cc65fdf064076a4081c3269d14a",
37+
"version": "2.1.0"
3838
}
3939
},
4040
{
4141
"package": "swift-nio",
4242
"repositoryURL": "https://github.com/apple/swift-nio.git",
4343
"state": {
4444
"branch": null,
45-
"revision": "03c541a24dd0558c942b15d8464eb75d70a921c4",
46-
"version": "1.12.1"
45+
"revision": "ba7970fe396e8198b84c6c1b44b38a1d4e2eb6bd",
46+
"version": "1.14.1"
4747
}
4848
},
4949
{

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.2
1+
// swift-tools-version:5.0
22
import PackageDescription
33

44
let package = Package(
@@ -9,7 +9,7 @@ let package = Package(
99
],
1010

1111
dependencies: [
12-
.package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "0.9.0"),
12+
.package(url: "https://github.com/GraphQLSwift/GraphQL.git", .branch("master")),
1313
],
1414

1515
targets: [

Sources/Graphiti/Graphiti.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ final class AnyType : Hashable {
99
self.type = type
1010
}
1111

12-
var hashValue: Int {
13-
return String(describing: type).hashValue
12+
func hash(into hasher: inout Hasher) {
13+
hasher.combine(String(describing: type))
1414
}
1515

1616
static func == (lhs: AnyType, rhs: AnyType) -> Bool {

Sources/Graphiti/Schema/Schema.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ public extension SchemaBuilder {
348348
return outputType
349349
}
350350

351-
public func getInputType(from type: Any.Type, field: String) throws -> GraphQLInputType {
351+
func getInputType(from type: Any.Type, field: String) throws -> GraphQLInputType {
352352
guard let graphQLType = getGraphQLType(from: type) else {
353353
throw GraphQLError(
354354
message:

0 commit comments

Comments
 (0)