Merge branch 'master' into update/scala-library-2.12.19

pvlugter · web-flow · commit 302c3fa0097b · 2024-03-23T13:20:58.000+13:00
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -22,7 +22,7 @@ object Version {
   val pegdown    = "1.6.0"
   val parboiled  = "1.4.1"
   val prettify   = "4-Mar-2013-1"
-  val sbtWeb     = "1.5.4"
+  val sbtWeb     = "1.5.5"
   val scalatest  = "3.2.18"
   val st4        = "4.3.4"
   val jsoup      = "1.16.1"
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -29,7 +29,7 @@ lazy val metaThemePlugin = (project in file("theme-plugin"))
   .settings(
     sbtPlugin    := true,
     scalaVersion := "2.12.19",
-    addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4"),
+    addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.5"),
     Compile / unmanagedSourceDirectories :=
       mirrorScalaSource((ThisBuild / baseDirectory).value.getParentFile / "theme-plugin")
   )

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ lazy val metaThemePlugin = (project in file("theme-plugin"))`
`29`	`29`	`.settings(`
`30`	`30`	`sbtPlugin := true,`
`31`	`31`	`scalaVersion := "2.12.19",`
`32`		`- addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4"),`
	`32`	`+ addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.5"),`
`33`	`33`	`Compile / unmanagedSourceDirectories :=`
`34`	`34`	`mirrorScalaSource((ThisBuild / baseDirectory).value.getParentFile / "theme-plugin")`
`35`	`35`	`)`