Merge pull request #48 from SportlabsTechnology/swift5

Swift5

Author: paulofaria

.swift-version

@@ -1 +1 @@
-4.2
+5.0

.travis.yml

@@ -1,11 +1,14 @@
 notifications:
   slack: zewo:VjyVCCQvTOw9yrbzQysZezD1
 language: generic
+env:
+  global:
+  - SWIFT_VERSION=5.0
 matrix:
   include:
     - os: osx
       env: JOB=SwiftPM_OSX
-      osx_image: xcode10.1
+      osx_image: xcode10.2
     - os: linux
       env: JOB=SwiftPM_linux
       dist: trusty

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 import PackageDescription
 
 let package = Package(
@@ -9,7 +9,7 @@ let package = Package(
     ],
 
     dependencies: [
-        .package(url: "https://github.com/wickwirew/Runtime.git", from: "1.1.0"),
+        .package(url: "https://github.com/wickwirew/Runtime.git", .upToNextMinor(from: "2.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"),

Package.swift

@@ -91,8 +91,8 @@ extension GraphQLError : CustomStringConvertible {
 }
 
 extension GraphQLError : Hashable {
-    public var hashValue: Int {
-        return message.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(message)
     }
 
     public static func == (lhs: GraphQLError, rhs: GraphQLError) -> Bool {

Sources/GraphQL/Error/GraphQLError.swift

@@ -337,8 +337,8 @@ public final class OperationDefinition {
 }
 
 extension OperationDefinition : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: OperationDefinition, rhs: OperationDefinition) -> Bool {
@@ -450,8 +450,8 @@ public final class SelectionSet {
 }
 
 extension SelectionSet : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: SelectionSet, rhs: SelectionSet) -> Bool {
@@ -709,8 +709,8 @@ public final class FragmentDefinition {
 }
 
 extension FragmentDefinition : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: FragmentDefinition, rhs: FragmentDefinition) -> Bool {

Sources/GraphQL/Language/AST.swift

@@ -597,38 +597,22 @@ public func == (lhs: Map, rhs: Map) -> Bool {
 // MARK: Hashable
 
 extension Map : Hashable {
-    public var hashValue: Int {
+    public func hash(into hasher: inout Hasher) {
         switch self {
         case .null:
-            return 0
+            hasher.combine(0)
         case .bool(let bool):
-            return bool.hashValue
+            hasher.combine(bool)
         case .double(let double):
-            return double.hashValue
+            hasher.combine(double)
         case .int(let int):
-            return int.hashValue
+            hasher.combine(int)
         case .string(let string):
-            return string.hashValue
+            hasher.combine(string)
         case .array(let array):
-            var hash = 5381
-
-            for item in array {
-                hash = ((hash << 5) &+ hash) &+ item.hashValue
-            }
-
-            return hash
+            hasher.combine(array)
         case .dictionary(let dictionary):
-            var hash = 5381
-            var keyHash = 5381
-            var valueHash = 5381
-
-            for (key, value) in dictionary {
-                keyHash = ((keyHash << 5) &+ keyHash) &+ key.hashValue
-                valueHash = ((valueHash << 5) &+ valueHash) &+ value.hashValue
-                hash = ((hash << 5) &+ hash) &+ (keyHash ^ valueHash)
-            }
-
-            return hash
+            hasher.combine(dictionary)
         }
     }
 }