Merge pull request ml-archive#43 from tonyarnold/6.0.0-beta.2

Update package to work with Leaf 4.0.0
brokenhandsio · Sep 2, 2021 · 4e3e7c6 · 4e3e7c6
2 parents f05caa1 + 82efc06
commit 4e3e7c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Package.swift b/Package.swift
@@ -10,7 +10,7 @@ let package = Package(
         .library(name: "Flash", targets: ["Flash"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/leaf.git", from: "4.0.0-rc"),
+        .package(url: "https://github.com/vapor/leaf.git", from: "4.0.0"),
         .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
     ],
     targets: [

diff --git a/Sources/Flash/Tags/FlashTag.swift b/Sources/Flash/Tags/FlashTag.swift
@@ -1,4 +1,5 @@
 import Leaf
+import LeafKit
 import Vapor
 
 public struct FlashTag: LeafTag {
@@ -26,7 +27,6 @@ public struct FlashTag: LeafTag {
 }
 
 extension Collection where Element: LeafDataRepresentable {
-    /// Note that this is _not_ conformance to `LeafDataRepresentable`, as the return type here is non-optional. It will always produce a result.
     var leafData: LeafData {
         .array(compactMap { $0.leafData })
     }
@@ -39,7 +39,7 @@ extension Flash: LeafDataRepresentable {
         static let message = "message"
     }
 
-    public var leafData: LeafData? {
+    public var leafData: LeafData {
         .dictionary([
             DataKey.kind: .string(kind.rawValue),
             DataKey.bootstrapClass: .string(kind.bootstrapClass),