Use Vapor 2

vapor-community · May 31, 2017 · 6b4dd15 · 6b4dd15
1 parent 1ee220b
commit 6b4dd15
Show file tree

Hide file tree

Showing 46 changed files with 632 additions and 1,490 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,3 @@ Packages
 .build
 .DS_Store
 *.xcodeproj
-
diff --git a/Package.pins b/Package.pins
@@ -2,112 +2,100 @@
   "autoPin": true,
   "pins": [
     {
-      "package": "CLibreSSL",
+      "package": "BCrypt",
       "reason": null,
-      "repositoryURL": "https://github.com/vapor/clibressl.git",
+      "repositoryURL": "https://github.com/vapor/bcrypt.git",
+      "version": "1.0.0"
+    },
+    {
+      "package": "Bits",
+      "reason": null,
+      "repositoryURL": "https://github.com/vapor/bits.git",
       "version": "1.0.0"
     },
     {
       "package": "Console",
       "reason": null,
       "repositoryURL": "https://github.com/vapor/console.git",
-      "version": "1.0.2"
+      "version": "2.0.0"
     },
     {
       "package": "Core",
       "reason": null,
       "repositoryURL": "https://github.com/vapor/core.git",
-      "version": "1.1.1"
+      "version": "2.0.0"
     },
     {
       "package": "Crypto",
       "reason": null,
       "repositoryURL": "https://github.com/vapor/crypto.git",
-      "version": "1.1.0"
+      "version": "2.0.0"
     },
     {
-      "package": "Engine",
+      "package": "CTLS",
       "reason": null,
-      "repositoryURL": "https://github.com/vapor/engine.git",
-      "version": "1.3.12"
+      "repositoryURL": "https://github.com/vapor/ctls.git",
+      "version": "1.0.0"
     },
     {
-      "package": "Fluent",
+      "package": "Debugging",
       "reason": null,
-      "repositoryURL": "https://github.com/vapor/fluent.git",
-      "version": "1.4.3"
+      "repositoryURL": "https://github.com/vapor/debugging.git",
+      "version": "1.0.0"
     },
     {
-      "package": "Jay",
+      "package": "Engine",
       "reason": null,
-      "repositoryURL": "https://github.com/DanToml/Jay.git",
-      "version": "1.0.1"
+      "repositoryURL": "https://github.com/vapor/engine.git",
+      "version": "2.0.0"
     },
     {
       "package": "JSON",
       "reason": null,
       "repositoryURL": "https://github.com/vapor/json.git",
-      "version": "1.0.6"
-    },
-    {
-      "package": "Leaf",
-      "reason": null,
-      "repositoryURL": "https://github.com/vapor/leaf.git",
-      "version": "1.0.7"
+      "version": "2.0.0"
     },
     {
       "package": "Multipart",
       "reason": null,
       "repositoryURL": "https://github.com/vapor/multipart.git",
-      "version": "1.0.3"
+      "version": "2.0.0"
     },
     {
       "package": "Node",
       "reason": null,
       "repositoryURL": "https://github.com/vapor/node.git",
-      "version": "1.0.1"
+      "version": "2.0.0"
     },
     {
-      "package": "PathIndexable",
+      "package": "Random",
       "reason": null,
-      "repositoryURL": "https://github.com/vapor/path-indexable.git",
+      "repositoryURL": "https://github.com/vapor/random.git",
       "version": "1.0.0"
     },
-    {
-      "package": "Polymorphic",
-      "reason": null,
-      "repositoryURL": "https://github.com/vapor/polymorphic.git",
-      "version": "1.0.1"
-    },
     {
       "package": "Routing",
       "reason": null,
       "repositoryURL": "https://github.com/vapor/routing.git",
-      "version": "1.1.0"
+      "version": "2.0.0"
     },
     {
-      "package": "Socks",
+      "package": "Sockets",
       "reason": null,
-      "repositoryURL": "https://github.com/vapor/socks.git",
-      "version": "1.2.7"
+      "repositoryURL": "https://github.com/vapor/sockets.git",
+      "version": "2.0.0"
     },
     {
       "package": "TLS",
       "reason": null,
       "repositoryURL": "https://github.com/vapor/tls.git",
-      "version": "1.1.2"
-    },
-    {
-      "package": "Turnstile",
-      "reason": null,
-      "repositoryURL": "https://github.com/stormpath/Turnstile.git",
-      "version": "1.0.6"
+      "version": "2.0.0"
     },
     {
       "package": "Vapor",
       "reason": null,
       "repositoryURL": "https://github.com/vapor/vapor.git",
-      "version": "1.5.14"
+      "version": "2.0.0"
     }
   ],
   "version": 1

diff --git a/Package.swift b/Package.swift
@@ -1,31 +1,8 @@
 import PackageDescription
 
 let package = Package(
-    name: "Mail",
-    targets: [
-        Target(
-            name: "Mail"
-        ),
-        Target(
-            name: "SendGrid",
-            dependencies: [
-                "Mail"
-            ]
-        ),
-        Target(
-            name: "SMTPClient",
-            dependencies: [
-                "Mail"
-            ]
-        ),
-        Target(
-            name: "Mailgun",
-            dependencies: [
-                "Mail"
-            ]
-        ),
-    ],
+    name: "Airmail",
     dependencies: [
-        .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 1, minor: 5),
+        .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2),
     ]
 )