upgrade

LiveUI · May 8, 2018 · 72d45d7 · 72d45d7
1 parent 6fc32db
commit 72d45d7
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 45 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,26 +6,26 @@
         "repositoryURL": "https://github.com/IBM-Swift/BlueCryptor.git",
         "state": {
           "branch": null,
-          "revision": "de20ec9af166d779a08c16f05146f4b9124478d0",
-          "version": "0.8.27"
+          "revision": "fae7286fbe20182a05d20e131f9861061a6aae77",
+          "version": "1.0.2"
         }
       },
       {
         "package": "Socket",
         "repositoryURL": "https://github.com/IBM-Swift/BlueSocket.git",
         "state": {
           "branch": null,
-          "revision": "26c8f4e4e3000421a0c97aaf0c7b5e9aa5475222",
-          "version": "0.12.94"
+          "revision": "c7847a9b002de2589d113a199ddb01f1d8b4ac89",
+          "version": "1.0.6"
         }
       },
       {
         "package": "SSLService",
         "repositoryURL": "https://github.com/IBM-Swift/BlueSSLService.git",
         "state": {
           "branch": null,
-          "revision": "3a87b64a97fb8e923f52f2a68e31e7bd4fc46b42",
-          "version": "0.12.84"
+          "revision": "f5c64deabd74c0842842020f7e9c048733829f6d",
+          "version": "1.0.6"
         }
       },
       {
@@ -34,79 +34,88 @@
         "state": {
           "branch": null,
           "revision": "9156d238dbc4c15455b77b45e721b2bb0b995e31",
-          "version": "0.1.5"
+          "version": "1.0.0"
         }
       },
       {
         "package": "Console",
         "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": "2ad95efabedc228ddbadee1974f6bbaac6c89abd",
-          "version": "3.0.3"
+          "revision": "efe79e4f59445b661ba7e6511c2a0b80645c2e72",
+          "version": "3.1.6"
         }
       },
       {
         "package": "Crypto",
         "repositoryURL": "https://github.com/vapor/crypto.git",
         "state": {
           "branch": null,
-          "revision": "e77aa181580b466fb26865918b62973d9fbfaed6",
-          "version": "3.0.0"
+          "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": "Engine",
-        "repositoryURL": "https://github.com/vapor/engine.git",
+        "package": "HTTP",
+        "repositoryURL": "https://github.com/vapor/http.git",
         "state": {
           "branch": null,
-          "revision": "4846ea9abeb04863f82f618ee8cb22650a82ae3c",
-          "version": "3.0.0-rc.2.1.1"
+          "revision": "9246340ae4c5310627099349fc74785267b55607",
+          "version": "3.0.5"
         }
       },
       {
         "package": "LoggerAPI",
         "repositoryURL": "https://github.com/IBM-Swift/LoggerAPI.git",
         "state": {
           "branch": null,
-          "revision": "ee0084cbb8bace59b3409cec05bedc5d2e97f8b7",
-          "version": "1.7.2"
+          "revision": "5041f2673aa75d6e973d9b6bd3956bc5068387c8",
+          "version": "1.7.3"
+        }
+      },
+      {
+        "package": "Multipart",
+        "repositoryURL": "https://github.com/vapor/multipart.git",
+        "state": {
+          "branch": null,
+          "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"
         }
       },
       {
         "package": "SendGrid",
         "repositoryURL": "https://github.com/vapor-community/sendgrid-provider.git",
         "state": {
           "branch": null,
-          "revision": "400914c4c54b34240cf7c99ce0464b1771f969c2",
-          "version": "3.0.1"
+          "revision": "45e61ff516a50da74821f869d1dce4746ffa7224",
+          "version": "3.0.3"
         }
       },
       {
@@ -123,17 +132,17 @@
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "a0b7f646fba61402da384b3202f54c27debb5e13",
-          "version": "1.3.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"
         }
       },
       {
@@ -159,54 +168,72 @@
         "repositoryURL": "https://github.com/IBM-Swift/Swift-SMTP.git",
         "state": {
           "branch": null,
-          "revision": "55679ee5697bc736bccd1b8f05d794718644fe5b",
-          "version": "3.0.0"
+          "revision": "54fbbb90df7c8e6dd952755701e4921c96b7d2d2",
+          "version": "4.0.1"
         }
       },
       {
         "package": "TemplateKit",
         "repositoryURL": "https://github.com/vapor/template-kit.git",
         "state": {
           "branch": null,
-          "revision": "497b987a79291c3743fe4ba6f17eadcdf20c1728",
-          "version": "1.0.0"
+          "revision": "43b57b5861d5181b906ac6411d28645e980bb638",
+          "version": "1.0.1"
+        }
+      },
+      {
+        "package": "URLEncodedForm",
+        "repositoryURL": "https://github.com/vapor/url-encoded-form.git",
+        "state": {
+          "branch": null,
+          "revision": "8448fa943057c01220f6a940d3b1b8e9fd92a96e",
+          "version": "1.0.2"
         }
       },
       {
         "package": "Validation",
         "repositoryURL": "https://github.com/vapor/validation.git",
         "state": {
           "branch": null,
-          "revision": "1ce87fc2d18a8f15a491805825063c8db493a51e",
-          "version": "2.0.0-rc.2.1.1"
+          "revision": "ab6c5a352d97c8687b91ed4963aef8e7cfe0795b",
+          "version": "2.0.0"
         }
       },
       {
         "package": "Vapor",
         "repositoryURL": "https://github.com/vapor/vapor.git",
         "state": {
           "branch": null,
-          "revision": "c045b8d02e6a135f055e879a9fa789026a0b4e9d",
-          "version": "3.0.0-rc.2.2.4"
+          "revision": "821184be792dfa144a82fe379784e04eb9dad1eb",
+          "version": "3.0.1"
         }
       },
       {
         "package": "Mailgun",
         "repositoryURL": "https://github.com/twof/VaporMailgunService.git",
         "state": {
           "branch": null,
-          "revision": "c04f7053b4279cb5602481c569b4b8f0748cb01a",
-          "version": "0.5.0"
+          "revision": "4d1cf725069cb508d064810cd52937ea9c8ebd3c",
+          "version": "1.0.1"
         }
       },
       {
         "package": "VaporTestTools",
         "repositoryURL": "https://github.com/LiveUI/VaporTestTools.git",
         "state": {
           "branch": "master",
-          "revision": "0791548a30e6a805bf9291b0ad6707c4085cc3ee",
+          "revision": "e07ce263257463f2f2af9e640f81eb95a72760e4",
           "version": null
         }
+      },
+      {
+        "package": "WebSocket",
+        "repositoryURL": "https://github.com/vapor/websocket.git",
+        "state": {
+          "branch": null,
+          "revision": "23acd21aa37a200faa2f5d5525c974efa6b5676c",
+          "version": "1.0.0"
+        }
       }
     ]
   },

diff --git a/Package.swift b/Package.swift
@@ -9,9 +9,9 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/vapor/vapor.git", from: "3.0.0-rc.2"),
-        .package(url: "https://github.com/twof/VaporMailgunService.git", from: "0.4.0"),
-        .package(url: "https://github.com/vapor-community/sendgrid-provider.git", from: "3.0.1"),
-        .package(url: "https://github.com/IBM-Swift/Swift-SMTP.git", from: "3.0.0"),
+        .package(url: "https://github.com/twof/VaporMailgunService.git", from: "1.0.0"),
+        .package(url: "https://github.com/vapor-community/sendgrid-provider.git", from: "3.0.3"),
+        .package(url: "https://github.com/IBM-Swift/Swift-SMTP.git", from: "4.0.0"),
         .package(url: "https://github.com/LiveUI/VaporTestTools.git", .branch("master"))
     ],
     targets: [

diff --git a/Sources/MailCore/Extensions/Message+SMTP.swift b/Sources/MailCore/Extensions/Message+SMTP.swift
@@ -13,9 +13,9 @@ import SwiftSMTP
 extension Mailer.Message {
 
     func asSmtpMail() -> Mail {
-        let fromUser = User(email: from)
+        let fromUser = Mail.User(email: from)
 
-        let toUser = User(email: to)
+        let toUser = Mail.User(email: to)
 
         let attachments: [Attachment]
         if let html = html {