diff --git a/plugin/src/main/scala/com/lightbend/paradox/sbt/ParadoxPlugin.scala b/plugin/src/main/scala/com/lightbend/paradox/sbt/ParadoxPlugin.scala index 52c50fc1..05bd2ff2 100644 --- a/plugin/src/main/scala/com/lightbend/paradox/sbt/ParadoxPlugin.scala +++ b/plugin/src/main/scala/com/lightbend/paradox/sbt/ParadoxPlugin.scala @@ -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 @@ -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 ), @@ -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 ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 636b75c6..11677e3b 100644 --- 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.4.4" + val sbtWeb = "1.5.3" val scalatest = "3.2.17" val st4 = "4.3.4" val jsoup = "1.16.1" @@ -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 } diff --git a/project/plugins.sbt b/project/plugins.sbt index e71528c2..58ed388b 100644 --- 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.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") )