Merge pull request #2 from Hexaville/swift4

Update files to Swift 4 layout

Author: noppoMan

Package.pins

@@ -1,16 +1,21 @@
-// swift-tools-version:3.1
+// swift-tools-version:4.0
 
 import PackageDescription
 
 let package = Package(
     name: "DynamodbSessionStore",
-    targets: [
-        Target(name: "DynamodbSessionStore"),
-        Target(name: "DynamodbSessionStoreTableManager"),
-        Target(name: "DynamodbSessionStoreExample", dependencies: ["DynamodbSessionStore"])
+    products: [
+        .library(name: "DynamodbSessionStore", targets: ["DynamodbSessionStore"]),
+        .executable(name: "dynamodb-session-store-table-manager", targets: ["DynamodbSessionStoreTableManager"]),
+        .executable(name: "dynamodb-session-store-example", targets: ["DynamodbSessionStoreExample"]),
     ],
     dependencies: [
-        .Package(url: "https://github.com/swift-aws/dynamodb.git", majorVersion: 0, minor: 1),
-        .Package(url: "https://github.com/noppoMan/HexavilleFramework.git", majorVersion: 0, minor: 1)
+        .package(url: "https://github.com/swift-aws/dynamodb.git", .upToNextMajor(from: "1.0.0")),
+        .package(url: "https://github.com/noppoMan/HexavilleFramework.git", .upToNextMajor(from: "0.1.15"))
+    ],
+    targets: [
+        .target(name: "DynamodbSessionStore", dependencies: ["SwiftAWSDynamodb", "HexavilleFramework"]),
+        .target(name: "DynamodbSessionStoreTableManager", dependencies: ["DynamodbSessionStore"]),
+        .target(name: "DynamodbSessionStoreExample", dependencies: ["DynamodbSessionStore"])
     ]
 )

Package.resolved

@@ -20,7 +20,7 @@ app.use { req, context in
     return .next(req)
 }
 
-let router = Router()
+var router = Router()
 
 router.use(.get, "/") { req, context in
     if let now = context.session?["now"] {

Package.swift

@@ -11,9 +11,9 @@ class CreateCommand: Command {
 
     let name = "create"
     let tableName = Parameter()
-    let writeCapacityUnits = Key<Int>("--writeCapacityUnits", usage: "numnber of WriteCapacityUnits")
-    let readCapacityUnits = Key<Int>("--readCapacityUnits", usage: "numnber of ReadCapacityUnits")
-    let endpoint = Key<String>("--endpoint", usage: "The endpoint string. ex: http://localhost:8000")
+    let writeCapacityUnits = Key<Int>("--writeCapacityUnits", description: "numnber of WriteCapacityUnits")
+    let readCapacityUnits = Key<Int>("--readCapacityUnits", description: "numnber of ReadCapacityUnits")
+    let endpoint = Key<String>("--endpoint", description: "The endpoint string. ex: http://localhost:8000")
 
     func execute() throws {
         let dynamodb = Dynamodb(endpoint: endpoint.value)
@@ -94,7 +94,7 @@ class CreateCommand: Command {
 class DeleteCommand: Command {
     let name = "delete"
     let tableName = Parameter()
-    let endpoint = Key<String>("--endpoint", usage: "The endpoint string. ex: http://localhost:8000")
+    let endpoint = Key<String>("--endpoint", description: "The endpoint string. ex: http://localhost:8000")
 
     func execute() throws {
         do {
@@ -107,6 +107,6 @@ class DeleteCommand: Command {
     }
 }
 
-CLI.setup(name: "hexaville-dynamodb-session-store-table-manager")
-CLI.register(commands: [CreateCommand(), DeleteCommand()])
-_ = CLI.go()
+let ddbSesTableManagerCLI = CLI(name: "hexaville-dynamodb-session-store-table-manager")
+ddbSesTableManagerCLI.commands = [CreateCommand(), DeleteCommand()]
+_ = ddbSesTableManagerCLI.go()