swift 4

vapor-community · Sep 13, 2017 · 212b63d · 212b63d
1 parent b04c9ce
commit 212b63d
Show file tree

Hide file tree

Showing 3 changed files with 205 additions and 1 deletion.
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,178 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "Auth",
+        "repositoryURL": "https://github.com/vapor/auth.git",
+        "state": {
+          "branch": null,
+          "revision": "f5834fbcb6e658ae8313195cb915ebb475f4a6a8",
+          "version": "1.2.0"
+        }
+      },
+      {
+        "package": "BCrypt",
+        "repositoryURL": "https://github.com/vapor/bcrypt.git",
+        "state": {
+          "branch": null,
+          "revision": "3ee4aca16ba6ebfb1ad48cc5fd4dfb163c6d6be8",
+          "version": "1.1.0"
+        }
+      },
+      {
+        "package": "Bits",
+        "repositoryURL": "https://github.com/vapor/bits.git",
+        "state": {
+          "branch": null,
+          "revision": "c32f5e6ae2007dccd21a92b7e33eba842dd80d2f",
+          "version": "1.1.0"
+        }
+      },
+      {
+        "package": "CTLS",
+        "repositoryURL": "https://github.com/vapor/ctls.git",
+        "state": {
+          "branch": null,
+          "revision": "fddec6a4643d6e85b6bb6dc54b1b5cdbabd395d2",
+          "version": "1.1.2"
+        }
+      },
+      {
+        "package": "Console",
+        "repositoryURL": "https://github.com/vapor/console.git",
+        "state": {
+          "branch": null,
+          "revision": "11c0694857d1be6c7b8b30d8db8b1162b73f2a2b",
+          "version": "2.2.0"
+        }
+      },
+      {
+        "package": "Core",
+        "repositoryURL": "https://github.com/vapor/core.git",
+        "state": {
+          "branch": null,
+          "revision": "b8330808f4f6b69941961afe8ad6b015562f7b7c",
+          "version": "2.1.2"
+        }
+      },
+      {
+        "package": "Crypto",
+        "repositoryURL": "https://github.com/vapor/crypto.git",
+        "state": {
+          "branch": null,
+          "revision": "bf4470b9da79024aab79c85de80374f6c29e3864",
+          "version": "2.1.1"
+        }
+      },
+      {
+        "package": "Debugging",
+        "repositoryURL": "https://github.com/vapor/debugging.git",
+        "state": {
+          "branch": null,
+          "revision": "49c5e8f0a7cb5456a8f7c72c6cd9f1553e5885a8",
+          "version": "1.1.0"
+        }
+      },
+      {
+        "package": "Engine",
+        "repositoryURL": "https://github.com/vapor/engine.git",
+        "state": {
+          "branch": null,
+          "revision": "decf702d774ac630dfe0441ff76b4bb68257b77a",
+          "version": "2.2.1"
+        }
+      },
+      {
+        "package": "Fluent",
+        "repositoryURL": "https://github.com/vapor/fluent.git",
+        "state": {
+          "branch": null,
+          "revision": "271ab0e0b9a81d0befc2673332715c3384f186bf",
+          "version": "2.4.0"
+        }
+      },
+      {
+        "package": "JSON",
+        "repositoryURL": "https://github.com/vapor/json.git",
+        "state": {
+          "branch": null,
+          "revision": "5c2a62771cefdb04b1f96f4ccc52b581fe20cfb1",
+          "version": "2.2.0"
+        }
+      },
+      {
+        "package": "Multipart",
+        "repositoryURL": "https://github.com/vapor/multipart.git",
+        "state": {
+          "branch": null,
+          "revision": "f32d0952b8d4dfcef5ea194e85c1968d90f97bf0",
+          "version": "2.1.0"
+        }
+      },
+      {
+        "package": "Node",
+        "repositoryURL": "https://github.com/vapor/node.git",
+        "state": {
+          "branch": null,
+          "revision": "642f357d08ec5aa335ae2e3c4633c72da7b5a0c4",
+          "version": "2.1.1"
+        }
+      },
+      {
+        "package": "Random",
+        "repositoryURL": "https://github.com/vapor/random.git",
+        "state": {
+          "branch": null,
+          "revision": "d7c4397d125caba795d14d956efacfe2a27a63d0",
+          "version": "1.2.0"
+        }
+      },
+      {
+        "package": "Routing",
+        "repositoryURL": "https://github.com/vapor/routing.git",
+        "state": {
+          "branch": null,
+          "revision": "66750975f5e5abaacf4bfa4d37ec85dd20c89312",
+          "version": "2.1.0"
+        }
+      },
+      {
+        "package": "SQLite",
+        "repositoryURL": "https://github.com/vapor/sqlite.git",
+        "state": {
+          "branch": null,
+          "revision": "f110cbe9ff5283eca7d2edf1b8ee69dfb8b666d6",
+          "version": "2.2.0"
+        }
+      },
+      {
+        "package": "Sockets",
+        "repositoryURL": "https://github.com/vapor/sockets.git",
+        "state": {
+          "branch": null,
+          "revision": "f6b06982e94db71227e99c56fec5899a8526e8ad",
+          "version": "2.1.0"
+        }
+      },
+      {
+        "package": "TLS",
+        "repositoryURL": "https://github.com/vapor/tls.git",
+        "state": {
+          "branch": null,
+          "revision": "6c6eedb6761cddc6b6c87142a27eec13fa1701ec",
+          "version": "2.1.1"
+        }
+      },
+      {
+        "package": "Vapor",
+        "repositoryURL": "https://github.com/vapor/vapor.git",
+        "state": {
+          "branch": null,
+          "revision": "59bde985edbdf6480c541485317c8d41cc5fefb7",
+          "version": "2.2.2"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package@swift-4.swift b/Package@swift-4.swift
@@ -0,0 +1,20 @@
+// swift-tools-version:4.0
+import PackageDescription
+
+let package = Package(
+    name: "AuthProvider",
+    products: [
+    	.library(name: "AuthProvider", targets: ["AuthProvider"]),
+    ],
+    dependencies: [
+        // A web framework and server for Swift that works on macOS and Ubuntu. 
+        .package(url: "https://github.com/vapor/auth.git", .upToNextMajor(from: "1.2.0")),
+
+        // A web framework and server for Swift that works on macOS and Ubuntu. 
+        .package(url: "https://github.com/vapor/vapor.git", .upToNextMajor(from: "2.2.0")),
+    ],
+    targets: [
+    	.target(name: "AuthProvider", dependencies: ["Authentication", "Authorization", "Vapor"]),
+    	.testTarget(name: "AuthProviderTests", dependencies: ["AuthProvider", "Testing"])
+    ]
+)
diff --git a/circle.yml b/circle.yml
@@ -1,10 +1,16 @@
 dependencies:
   override:
     - eval "$(curl -sL https://apt.vapor.sh)"
-    - sudo apt-get install vapor
+    - sudo apt-get install swift
     - sudo chmod -R a+rx /usr/
 test:
   override:
     - swift build
     - swift build -c release
     - swift test
+    - sudo apt-get remove swift
+    - sudo apt-get install swift-beta
+    - swift build
+    - swift build -c release
+    - swift test
+