Merge pull request #115 from rb-de0/swift4.2

Support Swift 4.2
rb-de0 · Sep 26, 2018 · 3ea958d · 3ea958d
2 parents 32e0a7e + 0efe8f5
commit 3ea958d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 37 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.1.2
+4.2
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ env:
     - MYSQL_PASSWORD=test
     - MYSQL_PORT=3306
 
-osx_image: xcode9.4
+osx_image: xcode10
 before_install:
   - if [ $TRAVIS_OS_NAME == "osx" ]; then
       brew update;

diff --git a/Package.resolved b/Package.resolved
@@ -15,17 +15,17 @@
         "repositoryURL": "https://github.com/IBM-Swift/BlueCryptor.git",
         "state": {
           "branch": null,
-          "revision": "30b6cf38322838d1e973e0626c6abf9602b03cf5",
-          "version": "1.0.9"
+          "revision": "efdb770164a7d3b222d6dcb78f253633c38a2ec2",
+          "version": "1.0.10"
         }
       },
       {
         "package": "cmark",
         "repositoryURL": "https://github.com/brokenhandsio/cmark-gfm.git",
         "state": {
           "branch": null,
-          "revision": "28d762c29119b5e1c3c0ba1e87198a6c0abcdd7a",
-          "version": "1.0.0"
+          "revision": "351e5cb1bc6a43567b8ff9b9b3f7357c58bdda83",
+          "version": "1.0.1"
         }
       },
       {
@@ -51,17 +51,17 @@
         "repositoryURL": "https://github.com/vapor/core.git",
         "state": {
           "branch": null,
-          "revision": "7f56a09995bf3c8df562be456bdcda405d9d0678",
-          "version": "3.4.1"
+          "revision": "eb876a758733166a4fb20f3f0a17b480c5ea563e",
+          "version": "3.4.3"
         }
       },
       {
         "package": "Crypto",
         "repositoryURL": "https://github.com/vapor/crypto.git",
         "state": {
           "branch": null,
-          "revision": "4b85405430df1892ee3aa1554bdb477e96cf46ad",
-          "version": "3.2.0"
+          "revision": "5605334590affd4785a5839806b4504407e054ac",
+          "version": "3.3.0"
         }
       },
       {
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/vapor/database-kit.git",
         "state": {
           "branch": null,
-          "revision": "7a01659316b9f033fa2150d5cd5e9d3c3e46c2e3",
-          "version": "1.3.0"
+          "revision": "3a17dbbe9be5f8c37703e4b7982c1332ad6b00c4",
+          "version": "1.3.1"
         }
       },
       {
@@ -114,8 +114,8 @@
         "repositoryURL": "https://github.com/vapor/http.git",
         "state": {
           "branch": null,
-          "revision": "a192ee144ab53370b2c095c003f429746df85595",
-          "version": "3.1.0"
+          "revision": "9e3eff9dfa4df7fc282bf27f801c72b3ffbfd984",
+          "version": "3.1.4"
         }
       },
       {
@@ -150,17 +150,17 @@
         "repositoryURL": "https://github.com/vapor/mysql.git",
         "state": {
           "branch": null,
-          "revision": "448f1ca28b3ea0f64a627bec22e5b0945d31b9f4",
-          "version": "3.0.2"
+          "revision": "355fdc8c60a4869026ff8f19e21f5d5bdbb08e62",
+          "version": "3.1.0"
         }
       },
       {
         "package": "Pagination",
         "repositoryURL": "https://github.com/vapor-community/pagination.git",
         "state": {
           "branch": null,
-          "revision": "91658b8ff9300a196190faaa300b33c5e975783c",
-          "version": "1.0.6"
+          "revision": "d018e2a02ed94536ad494ff750057990e8ae1acf",
+          "version": "1.0.7"
         }
       },
       {
@@ -177,8 +177,8 @@
         "repositoryURL": "https://github.com/vapor/redis.git",
         "state": {
           "branch": null,
-          "revision": "7ad1ad7715a90c468cc4fcf427f21635f8e8879e",
-          "version": "3.0.0"
+          "revision": "2fb20632db3ad86e2b3596cd34605f694a92c177",
+          "version": "3.0.2"
         }
       },
       {
@@ -204,35 +204,35 @@
         "repositoryURL": "https://github.com/vapor/sql.git",
         "state": {
           "branch": null,
-          "revision": "bfbaa048f9e655218611b65da470efa7deb16616",
-          "version": "2.0.2"
+          "revision": "a35cf1dced4ddd32bb2dc8b6e765aea7bcf8d6e0",
+          "version": "2.1.0"
         }
       },
       {
         "package": "SQLite",
         "repositoryURL": "https://github.com/vapor/sqlite.git",
         "state": {
           "branch": null,
-          "revision": "635ad49b2d6395b63462abffcce58ee38be1e4cc",
-          "version": "3.0.0"
+          "revision": "ad2e9bc9f0ed00ef2c6a05f89c1cec605467c90f",
+          "version": "3.1.0"
         }
       },
       {
         "package": "swift-nio",
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "cf08e673dc41dc63d34065234c8fc432e8d334c4",
-          "version": "1.9.2"
+          "revision": "5d8148c8b45dfb449276557f22120694567dd1d2",
+          "version": "1.9.5"
         }
       },
       {
         "package": "swift-nio-ssl",
         "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
         "state": {
           "branch": null,
-          "revision": "6617eb0d3afcb12170594968df01ca63afb58ac5",
-          "version": "1.2.0"
+          "revision": "8380fa29a2af784b067d8ee01c956626ca29f172",
+          "version": "1.3.1"
         }
       },
       {
@@ -258,8 +258,8 @@
         "repositoryURL": "https://github.com/scinfu/SwiftSoup.git",
         "state": {
           "branch": null,
-          "revision": "f445c9067d28346e828e615e2b43cb07b20bca35",
-          "version": "1.7.2"
+          "revision": "489072c6b1f1ebcc650538f55c0faaa627eeb88f",
+          "version": "1.7.4"
         }
       },
       {
@@ -276,8 +276,8 @@
         "repositoryURL": "https://github.com/vapor/url-encoded-form.git",
         "state": {
           "branch": null,
-          "revision": "cbfe7ef6301557d3f2d0807a98165232ae06e1c6",
-          "version": "1.0.4"
+          "revision": "932024f363ee5ff59059cf7d67194a1c271d3d0c",
+          "version": "1.0.5"
         }
       },
       {
@@ -294,8 +294,8 @@
         "repositoryURL": "https://github.com/vapor/vapor.git",
         "state": {
           "branch": null,
-          "revision": "54632a6c1e7ecd9923c0d00b612de936de1c4745",
-          "version": "3.0.8"
+          "revision": "157d3b15336caa882662cc75024dd04b2e225246",
+          "version": "3.1.0"
         }
       },
       {
@@ -312,8 +312,8 @@
         "repositoryURL": "https://github.com/vapor/websocket.git",
         "state": {
           "branch": null,
-          "revision": "141cb4d3814dc8062cb0b2f43e72801b5dfcf272",
-          "version": "1.0.1"
+          "revision": "149af03348f60ac8b84defdf277112d62fd8c704",
+          "version": "1.0.2"
         }
       }
     ]

diff --git a/Sources/App/Middleware/AuthErrorMiddleware.swift b/Sources/App/Middleware/AuthErrorMiddleware.swift
@@ -8,7 +8,7 @@ final class AuthErrorMiddleware<A>: Middleware, Service where A: Authenticatable
             return try next.respond(to: request)
         }
 
-        let response = request.makeResponse()
+        let response = request.response()
         response.http.status = .forbidden
         return Future.map(on: request) { response }
     }