Merge pull request #8 from skelpo/develop

Updated Vapor version to official release
skelpo · May 7, 2018 · e88d78b · e88d78b
2 parents e113d94 + 35760f0
commit e88d78b
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 31 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -15,53 +15,53 @@
         "repositoryURL": "https://github.com/vapor/console.git",
         "state": {
           "branch": null,
-          "revision": "038e30ec9004fb1915d14d964a3facc1ec5c80f4",
-          "version": "3.0.0"
+          "revision": "5b9796d39f201b3dd06800437abd9d774a455e57",
+          "version": "3.0.2"
         }
       },
       {
         "package": "Core",
         "repositoryURL": "https://github.com/vapor/core.git",
         "state": {
           "branch": null,
-          "revision": "c61a29ef08e7c8b3e836954269678c5a8fa31f3f",
-          "version": "3.1.2"
+          "revision": "efe79e4f59445b661ba7e6511c2a0b80645c2e72",
+          "version": "3.1.6"
         }
       },
       {
         "package": "Crypto",
         "repositoryURL": "https://github.com/vapor/crypto.git",
         "state": {
           "branch": null,
-          "revision": "a5598aba7a118c29b224122c16598a1919b9e67d",
-          "version": "3.0.1"
+          "revision": "1b8c2ba5a42f1adf2aa812204678d8b16466fa59",
+          "version": "3.1.2"
         }
       },
       {
         "package": "DatabaseKit",
         "repositoryURL": "https://github.com/vapor/database-kit.git",
         "state": {
           "branch": null,
-          "revision": "e594e658cc001e04b8d4ad13881d8714c510f94f",
-          "version": "1.0.0-rc.2.2.2"
+          "revision": "0db303439e5ef8b6df50a2b6c4029edddee90cb0",
+          "version": "1.0.1"
         }
       },
       {
         "package": "Fluent",
         "repositoryURL": "https://github.com/vapor/fluent.git",
         "state": {
           "branch": null,
-          "revision": "eb63485dfd6fbd0773a25e1b94830fbcedaa8266",
-          "version": "3.0.0-rc.2.3.1"
+          "revision": "8f22ef2dfeb278179a2d6e91769a5c1ceccf31ef",
+          "version": "3.0.0-rc.2.4.1"
         }
       },
       {
         "package": "HTTP",
         "repositoryURL": "https://github.com/vapor/http.git",
         "state": {
           "branch": null,
-          "revision": "2cb664097006e3fda625934079b51c90438947e1",
-          "version": "3.0.0"
+          "revision": "9246340ae4c5310627099349fc74785267b55607",
+          "version": "3.0.5"
         }
       },
       {
@@ -78,26 +78,26 @@
         "repositoryURL": "https://github.com/skelpo/JWTVapor.git",
         "state": {
           "branch": null,
-          "revision": "7f0adabec9edb65aecf190645fc4a19c4074c6c2",
-          "version": "0.6.1"
+          "revision": "9bab7ab42dc1e5d91d42982accb4e2e01c9327f3",
+          "version": "0.9.0"
         }
       },
       {
         "package": "Multipart",
         "repositoryURL": "https://github.com/vapor/multipart.git",
         "state": {
           "branch": null,
-          "revision": "d7b641af117910e66781022c1c82638216cad62c",
-          "version": "3.0.0"
+          "revision": "7778dcb62f3efa845e8e2808937bb347575ba7ce",
+          "version": "3.0.1"
         }
       },
       {
         "package": "Routing",
         "repositoryURL": "https://github.com/vapor/routing.git",
         "state": {
           "branch": null,
-          "revision": "2fc1d4de22a54848b35ad17b3e7f7816f19ebf90",
-          "version": "3.0.0-rc.2"
+          "revision": "3219e328491b0853b8554c5a694add344d2c6cfb",
+          "version": "3.0.1"
         }
       },
       {
@@ -109,22 +109,31 @@
           "version": "1.0.0"
         }
       },
+      {
+        "package": "SQL",
+        "repositoryURL": "https://github.com/vapor/sql.git",
+        "state": {
+          "branch": null,
+          "revision": "1bb94271d8645b6d6983721080ad642aa35d749c",
+          "version": "1.0.0"
+        }
+      },
       {
         "package": "swift-nio",
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "91ef938c60061784ba8734a73d61b7810494f9b3",
-          "version": "1.5.0"
+          "revision": "a5db2a67515ad2b490ac5646db204a5edf939f47",
+          "version": "1.6.1"
         }
       },
       {
         "package": "swift-nio-ssl",
         "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
         "state": {
           "branch": null,
-          "revision": "ea006b6368dbd9dbfd297deb6ddb3f070b72d043",
-          "version": "1.0.1"
+          "revision": "38955a5f806a952daf2b16fbfe9aa529749cf1dd",
+          "version": "1.1.0"
         }
       },
       {
@@ -150,8 +159,8 @@
         "repositoryURL": "https://github.com/vapor/template-kit.git",
         "state": {
           "branch": null,
-          "revision": "497b987a79291c3743fe4ba6f17eadcdf20c1728",
-          "version": "1.0.0"
+          "revision": "43b57b5861d5181b906ac6411d28645e980bb638",
+          "version": "1.0.1"
         }
       },
       {
@@ -177,17 +186,17 @@
         "repositoryURL": "https://github.com/vapor/vapor.git",
         "state": {
           "branch": null,
-          "revision": "95f94041400f54d0442d1dd5f12f91868d1a2a1c",
-          "version": "3.0.0-rc.2.6"
+          "revision": "821184be792dfa144a82fe379784e04eb9dad1eb",
+          "version": "3.0.1"
         }
       },
       {
         "package": "VaporRequestStorage",
         "repositoryURL": "https://github.com/skelpo/vapor-request-storage.git",
         "state": {
           "branch": null,
-          "revision": "4235043ed27f2a55ccf186e7402321697d154e16",
-          "version": "0.1.0"
+          "revision": "5db9ea747b8ef2c3e9df40cf2de906a6707aedc2",
+          "version": "0.3.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -8,9 +8,9 @@ let package = Package(
         .library(name: "JWTMiddleware", targets: ["JWTMiddleware", "JWTAuthenticatable"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/skelpo/vapor-request-storage.git", from: "0.1.0"),
-        .package(url: "https://github.com/skelpo/JWTVapor.git", from: "0.6.1"),
-        .package(url: "https://github.com/vapor/vapor.git", from: "3.0.0-rc"),
+        .package(url: "https://github.com/skelpo/vapor-request-storage.git", from: "0.3.0"),
+        .package(url: "https://github.com/skelpo/JWTVapor.git", from: "0.9.0"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "3.0.0"),
         .package(url: "https://github.com/vapor/auth.git", from: "2.0.0-rc")
     ],
     targets: [