From 2a1748c617d8164a2e7bee596e64fff590f049d5 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Wed, 31 Jan 2024 11:59:27 +0100
Subject: [PATCH] Upgrade dependencies

---
 build.sbt                                          |  7 +------
 .../scaladoc/can-aggregate/project/plugins.sbt     |  2 +-
 .../can-have-custom-mappings/project/plugins.sbt   |  2 +-
 .../plays-nice-with-ghpages/project/plugins.sbt    |  6 +-----
 project/build.properties                           |  2 +-
 project/plugins.sbt                                | 14 ++++----------
 6 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/build.sbt b/build.sbt
index e24c6ec..27a95bd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -67,11 +67,6 @@ lazy val core = project
       "ws.unfiltered" %% "unfiltered-filter" % unfilteredVersion,
       "ws.unfiltered" %% "unfiltered-jetty" % unfilteredVersion,
       "ws.unfiltered" %% "unfiltered-specs2" % unfilteredVersion % Test,
-    ).map(
-      // Force sbt-site to Scala XML 2.1
-      _.exclude("org.scala-lang.modules", "scala-xml_2.12")
-    ) ++ Seq(
-      "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
     )
   )
 
@@ -132,7 +127,7 @@ lazy val paradox = project
   .in(file("paradox"))
   .settings(
     name := "sbt-site-paradox",
-    addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.3")
+    addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.6")
   )
   .dependsOn(core)
   .enablePlugins(SbtPlugin)
diff --git a/core/src/sbt-test/scaladoc/can-aggregate/project/plugins.sbt b/core/src/sbt-test/scaladoc/can-aggregate/project/plugins.sbt
index 2c7d61f..87beb6c 100644
--- a/core/src/sbt-test/scaladoc/can-aggregate/project/plugins.sbt
+++ b/core/src/sbt-test/scaladoc/can-aggregate/project/plugins.sbt
@@ -1,2 +1,2 @@
 addSbtPlugin("com.github.sbt" % "sbt-site" % sys.props("project.version"))
-addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
+addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
diff --git a/core/src/sbt-test/site/can-have-custom-mappings/project/plugins.sbt b/core/src/sbt-test/site/can-have-custom-mappings/project/plugins.sbt
index 2c7d61f..87beb6c 100644
--- a/core/src/sbt-test/site/can-have-custom-mappings/project/plugins.sbt
+++ b/core/src/sbt-test/site/can-have-custom-mappings/project/plugins.sbt
@@ -1,2 +1,2 @@
 addSbtPlugin("com.github.sbt" % "sbt-site" % sys.props("project.version"))
-addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
+addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
diff --git a/core/src/sbt-test/site/plays-nice-with-ghpages/project/plugins.sbt b/core/src/sbt-test/site/plays-nice-with-ghpages/project/plugins.sbt
index 0a56a85..307778d 100644
--- a/core/src/sbt-test/site/plays-nice-with-ghpages/project/plugins.sbt
+++ b/core/src/sbt-test/site/plays-nice-with-ghpages/project/plugins.sbt
@@ -2,8 +2,4 @@ addSbtPlugin("com.github.sbt" % "sbt-site" % sys.props("project.version"))
 
 resolvers += "jgit-repo" at "https://download.eclipse.org/jgit/maven"
 
-addSbtPlugin(
-  ("com.github.sbt" % "sbt-ghpages" % "0.7.0")
-    // sbt-ghpages depends on sbt-site 1.4.1, which pulls Scala XML 1.x
-    .exclude("org.scala-lang.modules", "scala-xml_2.12")
-)
+addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
diff --git a/project/build.properties b/project/build.properties
index 46e43a9..e8a1e24 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.9.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
index edfd3ae..bab5e14 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,15 +1,9 @@
 addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.5.0")
 //#sbt-ghpages
-addSbtPlugin(
-  ("com.github.sbt" % "sbt-ghpages" % "0.7.0")
-    // sbt-ghpages depends on sbt-site 1.4.1, which pulls Scala XML 1.x
-    .exclude("org.scala-lang.modules", "scala-xml_2.12")
-)
+addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
 //#sbt-ghpages
-addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.6.0")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
+addSbtPlugin("com.github.sbt" % "sbt-paradox-material-theme" % "0.7.0")
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.6") // https://www.scala-sbt.org/sbt-paradox-material-theme/getting-started.html#jdk-11-
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
-
-libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always"
-libraryDependencySchemes += "org.scala-lang.modules" %% "scala-parser-combinators" % "always"