From a61f8af5e58f7ed38c8abde00a5196c65b9d867c Mon Sep 17 00:00:00 2001
From: noppoman <yuki@miketokyo.com>
Date: Tue, 10 Oct 2017 16:58:45 +0900
Subject: [PATCH] Update files to Swift 4 layout

---
 Package.pins                                  | 36 -------------
 Package.resolved                              | 52 +++++++++++++++++++
 Package.swift                                 | 14 +++--
 .../HexavilleAuth/HexavilleAuth+Router.swift  |  2 +-
 Sources/HexavilleAuthExample/main.swift       |  2 +-
 5 files changed, 63 insertions(+), 43 deletions(-)
 delete mode 100644 Package.pins
 create mode 100644 Package.resolved

diff --git a/Package.pins b/Package.pins
deleted file mode 100644
index f8c97f6..0000000
--- a/Package.pins
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "autoPin": true,
-  "pins": [
-    {
-      "package": "CHTTPParser",
-      "reason": null,
-      "repositoryURL": "https://github.com/Zewo/CHTTPParser.git",
-      "version": "0.14.0"
-    },
-    {
-      "package": "CLibreSSL",
-      "reason": null,
-      "repositoryURL": "https://github.com/vapor/clibressl.git",
-      "version": "1.0.0"
-    },
-    {
-      "package": "HexavilleFramework",
-      "reason": null,
-      "repositoryURL": "https://github.com/noppoMan/HexavilleFramework.git",
-      "version": "0.1.4"
-    },
-    {
-      "package": "Prorsum",
-      "reason": null,
-      "repositoryURL": "https://github.com/noppoMan/Prorsum.git",
-      "version": "0.1.13"
-    },
-    {
-      "package": "SwiftCLI",
-      "reason": null,
-      "repositoryURL": "https://github.com/jakeheis/SwiftCLI.git",
-      "version": "3.0.1"
-    }
-  ],
-  "version": 1
-}
\ No newline at end of file
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 0000000..e01fa9d
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,52 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "CHTTPParser",
+        "repositoryURL": "https://github.com/Zewo/CHTTPParser.git",
+        "state": {
+          "branch": null,
+          "revision": "88306ab33bb316b2eedd39c90f4be8f4ebf65a11",
+          "version": "0.14.0"
+        }
+      },
+      {
+        "package": "CLibreSSL",
+        "repositoryURL": "https://github.com/vapor/clibressl.git",
+        "state": {
+          "branch": null,
+          "revision": "23ddb296981d17a8ee6c7418742a40cad5d2f9d0",
+          "version": "1.0.0"
+        }
+      },
+      {
+        "package": "HexavilleFramework",
+        "repositoryURL": "https://github.com/noppoMan/HexavilleFramework.git",
+        "state": {
+          "branch": null,
+          "revision": "168658d90b7db006ac71ed6d2191f43fb423e744",
+          "version": "0.1.15"
+        }
+      },
+      {
+        "package": "Prorsum",
+        "repositoryURL": "https://github.com/noppoMan/Prorsum.git",
+        "state": {
+          "branch": null,
+          "revision": "6f2558056fb887a84331c5da7d6ac4211bc16187",
+          "version": "0.1.16"
+        }
+      },
+      {
+        "package": "SwiftCLI",
+        "repositoryURL": "https://github.com/jakeheis/SwiftCLI.git",
+        "state": {
+          "branch": null,
+          "revision": "8e5916bfcc7f8acee6fb2cb36d1ffefb02ac2460",
+          "version": "3.1.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
index 5327177..5a406c4 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,14 +1,18 @@
-// swift-tools-version:3.1
+// swift-tools-version:4.0
 
 import PackageDescription
 
 let package = Package(
     name: "HexavilleAuth",
-    targets: [
-        Target(name: "HexavilleAuth"),
-        Target(name: "HexavilleAuthExample", dependencies: ["HexavilleAuth"])
+    products: [
+        .library(name: "HexavilleAuth", targets: ["HexavilleAuth"]),
+        .executable(name: "hexaville-todo-example", targets: ["HexavilleAuthExample"])
     ],
     dependencies: [
-        .Package(url: "https://github.com/noppoMan/HexavilleFramework.git", majorVersion: 0, minor: 1)
+        .package(url: "https://github.com/noppoMan/HexavilleFramework.git", .upToNextMajor(from: "0.1.15"))
+    ],
+    targets: [
+        .target(name: "HexavilleAuth", dependencies: ["HexavilleFramework"]),
+        .target(name: "HexavilleAuthExample", dependencies: ["HexavilleAuth"])
     ]
 )
diff --git a/Sources/HexavilleAuth/HexavilleAuth+Router.swift b/Sources/HexavilleAuth/HexavilleAuth+Router.swift
index 75b19e7..8885888 100644
--- a/Sources/HexavilleAuth/HexavilleAuth+Router.swift
+++ b/Sources/HexavilleAuth/HexavilleAuth+Router.swift
@@ -11,7 +11,7 @@ import HexavilleFramework
 
 extension HexavilleAuth {
     func asRouter() -> Router {
-        let router = Router()
+        var router = Router()
         for type in providers {
             switch type {
             case .oauth1(let provider):
diff --git a/Sources/HexavilleAuthExample/main.swift b/Sources/HexavilleAuthExample/main.swift
index dfb744a..7524d99 100644
--- a/Sources/HexavilleAuthExample/main.swift
+++ b/Sources/HexavilleAuthExample/main.swift
@@ -87,7 +87,7 @@ app.use(HexavilleAuth.AuthenticationMiddleware())
 
 app.use(auth)
 
-let router = Router()
+var router = Router()
 
 router.use(.get, "/") { req, context in
     return Response(body: "Welcome to Hexaville Auth")