Dependency upgrades + require sbt 1.9.7 as minimum

.github/workflows/check-build-test.yml

@@ -19,7 +19,7 @@ jobs:
  fail-fast: false
  matrix:
  include:
- - { sbtCrossVersion: "1.4.9", jvmName: "temurin:1.11.0" }
+ - { sbtCrossVersion: "1.9.7", jvmName: "temurin:1.11.0" }
  # { jvmName: "temurin:1.11.0" }
  # { jvmName: "temurin:1.17.0" }
  steps:

build.sbt

@@ -19,7 +19,7 @@ inThisBuild(Seq(
 
 val pluginSettings = Seq(
  sbtPlugin := true,
- crossSbtVersions := List("1.4.9"),
+ crossSbtVersions := List("1.9.7"),
  scriptedLaunchOpts += "-Dproject.version=" + version.value
  // scriptedBufferLog := false
 )
@@ -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)

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")

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")

core/src/sbt-test/site/minimum-sbt-1.0/project/build.properties

@@ -1,2 +1,2 @@
 # When updating also change the minimum version noted in src/main/paradox/index.md
-sbt.version=1.4.9
+sbt.version=1.9.7

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")

laika/src/sbt-test/laika/blog-post/project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.9
+sbt.version=1.9.7

laika/src/sbt-test/laika/minimal/project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.9
+sbt.version=1.9.7

project/build.properties

@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.9.7

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"

src/main/paradox/index.md

@@ -6,6 +6,7 @@ Before upgrading please consult the @github:[release notes](/notes/). Instructio
 
 @@@ note
 
+* Version 1.6+ is published for sbt >= 1.9.7 and requires Java 11+.
 * Version 1.5+ is published for sbt >= 1.4.9 and requires Java 11+.
 * Version 1.4+ is published for sbt 1.2.x.
 * Version 1.3+ is cross published to both sbt 0.13 and sbt 1.x.

src/main/paradox/migration-guide.md

@@ -1,5 +1,9 @@
 # Migration Guide
 
+## Migrating from version 1.5.x to 1.6.x
+
+Only sbt >=1.9.7 is supported.
+
 ## Migrating from version 1.4.x to 1.5.x
 
 To cut down on dependencies, sbt-site is now spilt into separate modules per site generator. Three generators are available as specific sbt plugins: