Merge pull request #25 from SportlabsTechnology/master

Update .swift-version and travis config to swift 4.2

Author: paulofaria

.swift-version

@@ -1 +1 @@
-4.1
+4.2

.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

Package.resolved

@@ -6,35 +6,44 @@
         "repositoryURL": "https://github.com/vapor/core.git",
         "state": {
           "branch": null,
-          "revision": "174f909bc048a6aff27d6cb4c31810971f912cca",
-          "version": "3.2.2"
+          "revision": "1794ff138bd669175a2528d27695028d7cb30471",
+          "version": "3.5.0"
+        }
+      },
+      {
+        "package": "CRuntime",
+        "repositoryURL": "https://github.com/wickwirew/CRuntime.git",
+        "state": {
+          "branch": null,
+          "revision": "8d0dd0ca3787d15682c1f44de3d298459870b121",
+          "version": "1.0.0"
         }
       },
       {
         "package": "GraphQL",
         "repositoryURL": "https://github.com/GraphQLSwift/GraphQL.git",
         "state": {
-          "branch": null,
-          "revision": "1ab3c9050cb0aea4350dbc343454bb8c83adff34",
-          "version": "0.6.0"
+          "branch": "master",
+          "revision": "2ba73c3691dbcdeb6e09ad4f6df46536ba692c83",
+          "version": null
         }
       },
       {
         "package": "Runtime",
         "repositoryURL": "https://github.com/wickwirew/Runtime.git",
         "state": {
           "branch": null,
-          "revision": "23357609f0df427d870bb4bd22ac14e0a4ea1346",
-          "version": "0.7.1"
+          "revision": "40cdfbad9650512507c060824e1c4e9fc2ca721d",
+          "version": "1.1.0"
         }
       },
       {
         "package": "swift-nio",
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "695afc5205aaa49fca092b94b479ff71c43d9d3c",
-          "version": "1.8.0"
+          "revision": "03c541a24dd0558c942b15d8464eb75d70a921c4",
+          "version": "1.12.1"
         }
       },
       {

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 import PackageDescription
 
 let package = Package(
@@ -9,7 +9,7 @@ let package = Package(
     ],
 
     dependencies: [
-    .package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "0.6.0"),
+    .package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "0.8.0"),
     ],
 
     targets: [

Tests/GraphitiTests/StarWarsTests/StarWarsData.swift

@@ -210,23 +210,26 @@ func search(for value: String) -> [SearchResult] {
     let value = value.lowercased()
     var result: [SearchResult] = []
 
-    result.append(contentsOf: 
-        planetData.filter({
-            return $1.name.lowercased().range(of:value) != nil
-        }).map({ $1 })
-    )
-
-    result.append(contentsOf:
-        humanData.filter({
-            return $1.name.lowercased().range(of:value) != nil
-        }).map({ $1 })
-    )
-
-    result.append(contentsOf:
-        droidData.filter({
-            return $1.name.lowercased().range(of:value) != nil
-        }).map({ $1 })
-    )
+    // Due to randomness of hash values introduced by https://github.com/apple/swift-evolution/blob/master/proposals/0206-hashable-enhancements.md
+    // we should iterate over sorted keys here otherwise the order of output is random and the tests sometimes fails.
+    
+    planetData.keys.sorted().forEach {
+        if planetData[$0]?.name.lowercased().range(of:value) != nil {
+            result.append(planetData[$0]!)
+        }
+    }
+    
+    humanData.keys.sorted().forEach {
+        if humanData[$0]?.name.lowercased().range(of:value) != nil {
+           result.append(humanData[$0]!)
+        }
+    }
+    
+    droidData.keys.sorted().forEach {
+        if droidData[$0]?.name.lowercased().range(of:value) != nil {
+            result.append(droidData[$0]!)
+        }
+    }
 
     return result
 }

Tests/GraphitiTests/StarWarsTests/StarWarsIntrospectionTests.swift

@@ -18,7 +18,6 @@ class StarWarsIntrospectionTests : XCTestCase {
                     "    }" +
                     "}"
 
-        #if os(macOS)
         let expected: Map = [
             "data": [
                 "__schema": [
@@ -81,70 +80,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": "Int",
-                        ],
-                        [
-                            "name": "Planet",
-                        ],
-                        [
-                            "name": "Query",
-                        ],
-                        [
-                            "name": "SearchResult",
-                        ],
-                        [
-                            "name": "String",
-                        ],
-                    ],
-                ],
-            ],
-        ]
-        #endif
 
         let result = try starWarsSchema.execute(request: query, eventLoopGroup: eventLoopGroup).wait()
         XCTAssertEqual(result, expected)

Tests/GraphitiTests/StarWarsTests/StarWarsQueryTests.swift

@@ -609,6 +609,7 @@ class StarWarsQueryTests : XCTestCase {
             ]
 
         let result = try starWarsSchema.execute(request: query, eventLoopGroup: eventLoopGroup).wait()
+        
         XCTAssertEqual(result, expected)
     }
 }