diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index 9f201db..575dab2 100644 --- a/.github/workflows/check-build-test.yml +++ b/.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: diff --git a/build.sbt b/build.sbt index e24c6ec..7025fed 100644 --- a/build.sbt +++ b/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) 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/minimum-sbt-1.0/project/build.properties b/core/src/sbt-test/site/minimum-sbt-1.0/project/build.properties index 86af17f..559f5cb 100644 --- a/core/src/sbt-test/site/minimum-sbt-1.0/project/build.properties +++ b/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 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/laika/src/sbt-test/laika/blog-post/project/build.properties b/laika/src/sbt-test/laika/blog-post/project/build.properties index dbae93b..e8a1e24 100644 --- a/laika/src/sbt-test/laika/blog-post/project/build.properties +++ b/laika/src/sbt-test/laika/blog-post/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.9.7 diff --git a/laika/src/sbt-test/laika/minimal/project/build.properties b/laika/src/sbt-test/laika/minimal/project/build.properties index dbae93b..e8a1e24 100644 --- a/laika/src/sbt-test/laika/minimal/project/build.properties +++ b/laika/src/sbt-test/laika/minimal/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.9.7 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" diff --git a/src/main/paradox/index.md b/src/main/paradox/index.md index f9c5ee5..8a9dcfd 100644 --- a/src/main/paradox/index.md +++ b/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. diff --git a/src/main/paradox/migration-guide.md b/src/main/paradox/migration-guide.md index 512b696..3de5d52 100644 --- a/src/main/paradox/migration-guide.md +++ b/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: