From bc6e64e2b32b95d1773cdc1bfc31153df6c0d2e0 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 25 Feb 2024 12:17:29 +0100 Subject: [PATCH 1/2] Use sbt-web 1.5.x despite staying on paradox 0.9.2 --- build.sbt | 3 ++- project/plugins.sbt | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index ad2c204..1d4ecef 100644 --- a/build.sbt +++ b/build.sbt @@ -76,7 +76,8 @@ lazy val pekkoPlugin = project addSbtPlugin( // When updating the sbt-paradox version, // remember to also update project/plugins.sbt - "com.lightbend.paradox" % "sbt-paradox" % "0.10.3"), + ("com.lightbend.paradox" % "sbt-paradox" % "0.10.3").exclude("com.typesafe.sbt", "sbt-web")), + addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4"), // sbt-paradox < 10.depends on old sbt-web 1.4.x, but we want a newer version addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-apidoc" % "1.1.0"), addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-project-info" % "3.0.1"), addSbtPlugin("com.github.sbt" % "sbt-paradox-material-theme" % "0.7.0"), diff --git a/project/plugins.sbt b/project/plugins.sbt index c3d00fe..e7397a5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -17,8 +17,9 @@ // When updating the sbt-paradox version, // remember to also update build.sbt -addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-theme" % "0.9.2") -addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2") +addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-theme" % "0.9.2").exclude("com.typesafe.sbt", "sbt-web")) +addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox" % "0.9.2").exclude("com.typesafe.sbt", "sbt-web")) +addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4") // sbt-paradox[-theme] 0.9.2 depends on old sbt-web 1.4.x, but we want a newer version addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.11") From 751912ffefeacc3ebe5dec306af1333a6a3b35a5 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 25 Feb 2024 22:18:56 +0100 Subject: [PATCH 2/2] sbt-paradox 0.9.2 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 1d4ecef..37be11c 100644 --- a/build.sbt +++ b/build.sbt @@ -76,8 +76,8 @@ lazy val pekkoPlugin = project addSbtPlugin( // When updating the sbt-paradox version, // remember to also update project/plugins.sbt - ("com.lightbend.paradox" % "sbt-paradox" % "0.10.3").exclude("com.typesafe.sbt", "sbt-web")), - addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4"), // sbt-paradox < 10.depends on old sbt-web 1.4.x, but we want a newer version + ("com.lightbend.paradox" % "sbt-paradox" % "0.9.2").exclude("com.typesafe.sbt", "sbt-web")), + addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4"), // sbt-paradox 0.9.2 depends on old sbt-web 1.4.x, but we want a newer version addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-apidoc" % "1.1.0"), addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-project-info" % "3.0.1"), addSbtPlugin("com.github.sbt" % "sbt-paradox-material-theme" % "0.7.0"),