Merge pull request #61 from mkurz/sbt-web-1.5.x

Avoid sbt-web 1.4.x dependency, use latest 1.5.x
sbt · Feb 13, 2024 · 1261986 · 1261986
2 parents ac682e9 + 4cd337c
commit 1261986
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -73,7 +73,8 @@ lazy val plugin = project("sbt-paradox-material-theme", file("plugin"))
     scriptedLaunchOpts += "-Dproject.version=" + version.value,
     scriptedBufferLog := false,
     publishLocal := publishLocal.dependsOn(theme / publishLocal).value,
-    addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2"),
+    addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox" % "0.9.2").exclude("com.typesafe.sbt", "sbt-web")),
+    addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4"),
     libraryDependencies += "org.jsoup" % "jsoup"      % "1.17.2",
     libraryDependencies += "io.circe" %% "circe-core" % "0.14.5",
     update := update.dependsOn(theme / publishLocal).value,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,11 @@
-addSbtPlugin("com.lightbend.paradox" % "sbt-paradox"        % "0.9.2")
-addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-theme"  % "0.9.2")
-addSbtPlugin(("com.github.sbt"       % "sbt-site-paradox"   % "1.5.0").exclude("com.lightbend.paradox", "sbt-paradox"))
-addSbtPlugin("com.github.sbt"        % "sbt-ghpages"        % "0.8.0")
-addSbtPlugin("com.github.sbt"        % "sbt-ci-release"     % "1.5.12")
-addSbtPlugin("org.scalameta"         % "sbt-scalafmt"       % "2.5.2")
-addSbtPlugin("com.github.sbt"        % "sbt-github-actions" % "0.23.0")
+addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox"        % "0.9.2").exclude("com.typesafe.sbt", "sbt-web"))
+addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-theme"  % "0.9.2").exclude("com.typesafe.sbt", "sbt-web"))
+addSbtPlugin("com.github.sbt"         % "sbt-web"            % "1.5.4")
+addSbtPlugin(("com.github.sbt"        % "sbt-site-paradox"   % "1.5.0").exclude("com.lightbend.paradox", "sbt-paradox"))
+addSbtPlugin("com.github.sbt"         % "sbt-ghpages"        % "0.8.0")
+addSbtPlugin("com.github.sbt"         % "sbt-ci-release"     % "1.5.12")
+addSbtPlugin("org.scalameta"          % "sbt-scalafmt"       % "2.5.2")
+addSbtPlugin("com.github.sbt"         % "sbt-github-actions" % "0.23.0")
 
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value