packages: Update to the latest version of Vapor so things don’t clash

vapor-community · May 14, 2018 · ae48071 · ae48071
1 parent a561798
commit ae48071
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,44 +6,44 @@
         "repositoryURL": "https://github.com/vapor/console.git",
         "state": {
           "branch": null,
-          "revision": "30f102dcf4d18862a14df9f65c4b91d117005926",
-          "version": "3.0.1"
+          "revision": "5b9796d39f201b3dd06800437abd9d774a455e57",
+          "version": "3.0.2"
         }
       },
       {
         "package": "Core",
         "repositoryURL": "https://github.com/vapor/core.git",
         "state": {
           "branch": null,
-          "revision": "71722db60bcd94532d5ff5894b85d697e6e27db8",
-          "version": "3.1.3"
+          "revision": "a909eccc41941faac6fb9e511cdb9a5cb30a05de",
+          "version": "3.1.7"
         }
       },
       {
         "package": "Crypto",
         "repositoryURL": "https://github.com/vapor/crypto.git",
         "state": {
           "branch": null,
-          "revision": "346ae2b2ea65a4b6f4985a8e8cb25cf61da549d8",
-          "version": "3.1.1"
+          "revision": "1b8c2ba5a42f1adf2aa812204678d8b16466fa59",
+          "version": "3.1.2"
         }
       },
       {
         "package": "DatabaseKit",
         "repositoryURL": "https://github.com/vapor/database-kit.git",
         "state": {
           "branch": null,
-          "revision": "c4e4f08b83a2407989332f970d6447de07ee7b91",
-          "version": "1.0.0"
+          "revision": "0db303439e5ef8b6df50a2b6c4029edddee90cb0",
+          "version": "1.0.1"
         }
       },
       {
         "package": "HTTP",
         "repositoryURL": "https://github.com/vapor/http.git",
         "state": {
           "branch": null,
-          "revision": "f934c1391c370fbf529bd461b40aa75ce40ce1e5",
-          "version": "3.0.2"
+          "revision": "9246340ae4c5310627099349fc74785267b55607",
+          "version": "3.0.5"
         }
       },
       {
@@ -87,17 +87,17 @@
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "902b18df16897da644724bd4b85b4bbe952ac9c6",
-          "version": "1.5.1"
+          "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"
         }
       },
       {
@@ -132,8 +132,8 @@
         "repositoryURL": "https://github.com/vapor/url-encoded-form.git",
         "state": {
           "branch": null,
-          "revision": "8448fa943057c01220f6a940d3b1b8e9fd92a96e",
-          "version": "1.0.2"
+          "revision": "57cf7fb9c1a1014c50bc05123684a9139ad44127",
+          "version": "1.0.3"
         }
       },
       {
@@ -150,17 +150,17 @@
         "repositoryURL": "https://github.com/vapor/vapor.git",
         "state": {
           "branch": null,
-          "revision": "c834f9495ff5ab9768b74f5822ff23d795e36922",
-          "version": "3.0.0-rc.2.8.1"
+          "revision": "8c73eebf7c41c7d8bf83ff87f550e0f97d6aadc4",
+          "version": "3.0.2"
         }
       },
       {
         "package": "WebSocket",
         "repositoryURL": "https://github.com/vapor/websocket.git",
         "state": {
           "branch": null,
-          "revision": "23acd21aa37a200faa2f5d5525c974efa6b5676c",
-          "version": "1.0.0"
+          "revision": "141cb4d3814dc8062cb0b2f43e72801b5dfcf272",
+          "version": "1.0.1"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -9,7 +9,7 @@ let package = Package(
         .library(name: "APNS", targets: ["APNS"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/vapor.git", from: "3.0.0-rc"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "3.0.0"),
         .package(url: "https://github.com/vapor/jwt.git", from: "3.0.0-rc"),
     ],
     targets: [

diff --git a/Sources/APNS/APNS.swift b/Sources/APNS/APNS.swift
@@ -24,8 +24,7 @@ public final class APNS: ServiceType {
 
     /// Send the message
     public func send(message: Message) throws -> Future<APNSResult> {
-        let response = try self.client.respond(to: message.generateRequest(on: self.worker))
-        return response.map(to: APNSResult.self) { response in
+        return try self.client.send(message.generateRequest(on: self.worker)).map(to: APNSResult.self) { response in
             guard let body = response.http.body.data, body.count != 0 else {
                 return APNSResult.success(
                     apnsId: message.messageId,
@@ -51,7 +50,7 @@ public final class APNS: ServiceType {
     }
 
     public func sendRaw(message: Message) throws -> Future<Response> {
-        return try self.client.respond(to: message.generateRequest(on: self.worker))
+        return try self.client.send(message.generateRequest(on: self.worker))
     }
 
 }