Merge pull request #112 from nodes-vapor/feature/update-forms-version

Feature: Update forms version
ml-archive · Mar 9, 2018 · a468568 · a468568
2 parents 00d56a2 + 4d12bbc
commit a468568
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   MacOS:
     macos:
-      xcode: "9.0"
+      xcode: "9.2.0"
     steps:
       - checkout
       - restore_cache:
@@ -30,7 +30,7 @@ jobs:
             - .build
   Linux:
     docker:
-      - image: brettrtoomey/vapor-ci:0.0.1
+      - image: brettrtoomey/vapor-ci:0.0.2
     steps:
       - checkout
       - restore_cache:

diff --git a/Package.swift b/Package.swift
@@ -5,13 +5,13 @@ let package = Package(
     dependencies: [
         .Package(url: "https://github.com/harlanhaskins/Punctual.swift.git", majorVersion: 1),
         .Package(url: "https://github.com/nodes-vapor/flash.git", majorVersion: 1),
-        .Package(url: "https://github.com/nodes-vapor/forms.git", majorVersion: 0, minor: 5),
+        .Package(url: "https://github.com/nodes-vapor/forms.git", majorVersion: 0, minor: 6),
         .Package(url: "https://github.com/nodes-vapor/sugar.git", majorVersion: 2),
         .Package(url: "https://github.com/vapor/fluent-provider.git", majorVersion: 1),
         .Package(url: "https://github.com/vapor/jwt-provider.git", majorVersion: 1),
         .Package(url: "https://github.com/vapor/leaf-provider.git", majorVersion: 1),
-        .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2),
         .Package(url: "https://github.com/vapor/validation.git", majorVersion: 1),
+        .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2),
     ],
     exclude: [
         "Sourcery",

diff --git a/Package@swift-4.swift b/Package@swift-4.swift
@@ -10,7 +10,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/harlanhaskins/Punctual.swift.git", .upToNextMajor(from: "1.0.0")),
         .package(url: "https://github.com/nodes-vapor/flash.git", .upToNextMajor(from: "1.0.0")),
-        .package(url: "https://github.com/nodes-vapor/forms.git", .upToNextMinor(from: "0.5.0")),
+        .package(url: "https://github.com/nodes-vapor/forms.git", .upToNextMinor(from: "0.6.1")),
         .package(url: "https://github.com/nodes-vapor/sugar.git", .upToNextMajor(from: "2.0.0")),
         .package(url: "https://github.com/vapor/fluent-provider.git", .upToNextMajor(from: "1.0.0")),
         .package(url: "https://github.com/vapor/jwt-provider.git", .upToNextMajor(from: "1.0.0")),

diff --git a/Sources/JWTKeychain/Controllers/Frontend/FrontendUserControllerDelegate.swift b/Sources/JWTKeychain/Controllers/Frontend/FrontendUserControllerDelegate.swift
@@ -59,11 +59,7 @@ open class FrontendUserControllerDelegate<U: PasswordResettableUser>:
 
         return try viewRenderer.make(
             pathToFormView,
-            ViewData(
-                fieldset: fieldset,
-                request: request,
-                other: ViewData(["token": .string(token)])
-            )
+            ViewData([.fieldset: fieldset, .request: request, "token": token])
         )
     }