Skip to content

Commit

Permalink
bump: sbt-web 1.5.3 (was 1.4.4) (#598)
Browse files Browse the repository at this point in the history
* bump: sbt-web 1.5.3 (was 1.4.4)
* com.typesafe.sbt.web.Compat was dropped in sbt-web

---------

Co-authored-by: Scala Steward <scala_steward@virtuslab.com>
  • Loading branch information
mkurz and scala-steward authored Jan 25, 2024
1 parent 544d751 commit 80c9c01
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import com.lightbend.paradox.{ParadoxLogger, ParadoxProcessor}
import com.lightbend.paradox.markdown.{GitHubResolver, SnipDirective, Writer}
import com.lightbend.paradox.template.PageTemplate
import com.typesafe.sbt.web.Import.{Assets, WebKeys}
import com.typesafe.sbt.web.{Compat => WCompat, SbtWeb}
import com.typesafe.sbt.web.SbtWeb

import scala.concurrent.duration._
import scala.sys.process.ProcessLogger
Expand Down Expand Up @@ -184,7 +184,7 @@ object ParadoxPlugin extends AutoPlugin {
.deduplicateMappings((mappings in paradoxTheme).value, (WebKeys.deduplicators in paradoxTheme).value),
target in paradoxTheme := target.value / "paradox" / "theme" / configTarget(configuration.value),
paradoxThemeDirectory := SbtWeb.syncMappings(
WCompat.cacheStore(streams.value, "paradox-theme"),
streams.value.cacheStoreFactory.make("paradox-theme"),
(mappings in paradoxTheme).value,
(target in paradoxTheme).value
),
Expand Down Expand Up @@ -410,7 +410,7 @@ object ParadoxPlugin extends AutoPlugin {
},
target in scopeTask := target.value / "paradox" / siteDir / configTarget(configuration.value),
siteTask := SbtWeb.syncMappings(
WCompat.cacheStore(streams.value, "paradox-" + siteDir),
streams.value.cacheStoreFactory.make("paradox-" + siteDir),
(mappings in scopeTask).value,
(target in scopeTask).value
)
Expand Down
12 changes: 6 additions & 6 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.4"
val sbtWeb = "1.5.3"
val scalatest = "3.2.17"
val st4 = "4.3.4"
val jsoup = "1.16.1"
Expand All @@ -35,9 +35,9 @@ object Library {
"org.pegdown" % "pegdown" % Version.pegdown,
"org.parboiled" % "parboiled-java" % Version.parboiled // overwrite for JDK10 support
)
val prettify = "org.webjars" % "prettify" % Version.prettify
val sbtWeb = "com.typesafe.sbt" % "sbt-web" % Version.sbtWeb
val scalatest = "org.scalatest" %% "scalatest" % Version.scalatest
val st4 = "org.antlr" % "ST4" % Version.st4
val jsoup = "org.jsoup" % "jsoup" % Version.jsoup
val prettify = "org.webjars" % "prettify" % Version.prettify
val sbtWeb = "com.github.sbt" % "sbt-web" % Version.sbtWeb
val scalatest = "org.scalatest" %% "scalatest" % Version.scalatest
val st4 = "org.antlr" % "ST4" % Version.st4
val jsoup = "org.jsoup" % "jsoup" % Version.jsoup
}
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ lazy val metaThemePlugin = (project in file("theme-plugin"))
.settings(
sbtPlugin := true,
scalaVersion := "2.12.18",
addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.4"),
addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.3"),
Compile / unmanagedSourceDirectories :=
mirrorScalaSource((ThisBuild / baseDirectory).value.getParentFile / "theme-plugin")
)
Expand Down

0 comments on commit 80c9c01

Please sign in to comment.