From e936897df002ebac03cea0081ea8fe7acec4e5b8 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 21 Feb 2024 14:36:10 +0100 Subject: [PATCH] Set sbt 1.9.7 as minimum --- .github/workflows/check-build-test.yml | 2 +- build.sbt | 2 +- .../sbt-test/site/minimum-sbt-1.0/project/build.properties | 2 +- laika/src/sbt-test/laika/blog-post/project/build.properties | 2 +- laika/src/sbt-test/laika/minimal/project/build.properties | 2 +- src/main/paradox/index.md | 1 + src/main/paradox/migration-guide.md | 4 ++++ 7 files changed, 10 insertions(+), 5 deletions(-) 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 27a95bd..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 ) 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/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/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: