From 9142d56d13bc7df739f403a4c9d8d8545620229e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Oct 2025 18:25:46 +0000 Subject: [PATCH 1/4] Update scalafmt-core to 3.10.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 6354b7a..09b9517 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.10.0 +version = 3.10.1 runner.dialect = scala212source3 maxColumn = 120 project.git = true From 0726b5c8550104deb451421f5e6944deda890a91 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Oct 2025 18:25:53 +0000 Subject: [PATCH 2/4] Reformat with scalafmt 3.10.1 Executed command: scalafmt --non-interactive --- src/sbt-test/bomfile/bomname/project/Dependencies.scala | 2 +- src/sbt-test/bomfile/exists/project/Dependencies.scala | 2 +- src/sbt-test/dependencies/compile/project/Dependencies.scala | 2 +- .../dependencies/compileNoTree/project/Dependencies.scala | 2 +- .../dependencies/integrationTest/project/Dependencies.scala | 2 +- src/sbt-test/dependencies/test/project/Dependencies.scala | 2 +- .../dependenciesJson/compile/project/Dependencies.scala | 2 +- .../dependenciesJson/compileNoTree/project/Dependencies.scala | 2 +- .../dependenciesJson/integrationTest/project/Dependencies.scala | 2 +- src/sbt-test/dependenciesJson/test/project/Dependencies.scala | 2 +- .../schemaVersion/unsupported/project/Dependencies.scala | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/sbt-test/bomfile/bomname/project/Dependencies.scala b/src/sbt-test/bomfile/bomname/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/bomfile/bomname/project/Dependencies.scala +++ b/src/sbt-test/bomfile/bomname/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/bomfile/exists/project/Dependencies.scala b/src/sbt-test/bomfile/exists/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/bomfile/exists/project/Dependencies.scala +++ b/src/sbt-test/bomfile/exists/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/dependencies/compile/project/Dependencies.scala b/src/sbt-test/dependencies/compile/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/dependencies/compile/project/Dependencies.scala +++ b/src/sbt-test/dependencies/compile/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/dependencies/compileNoTree/project/Dependencies.scala b/src/sbt-test/dependencies/compileNoTree/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/dependencies/compileNoTree/project/Dependencies.scala +++ b/src/sbt-test/dependencies/compileNoTree/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/dependencies/integrationTest/project/Dependencies.scala b/src/sbt-test/dependencies/integrationTest/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/dependencies/integrationTest/project/Dependencies.scala +++ b/src/sbt-test/dependencies/integrationTest/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/dependencies/test/project/Dependencies.scala b/src/sbt-test/dependencies/test/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/dependencies/test/project/Dependencies.scala +++ b/src/sbt-test/dependencies/test/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/dependenciesJson/compile/project/Dependencies.scala b/src/sbt-test/dependenciesJson/compile/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/dependenciesJson/compile/project/Dependencies.scala +++ b/src/sbt-test/dependenciesJson/compile/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/dependenciesJson/compileNoTree/project/Dependencies.scala b/src/sbt-test/dependenciesJson/compileNoTree/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/dependenciesJson/compileNoTree/project/Dependencies.scala +++ b/src/sbt-test/dependenciesJson/compileNoTree/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/dependenciesJson/integrationTest/project/Dependencies.scala b/src/sbt-test/dependenciesJson/integrationTest/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/dependenciesJson/integrationTest/project/Dependencies.scala +++ b/src/sbt-test/dependenciesJson/integrationTest/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/dependenciesJson/test/project/Dependencies.scala b/src/sbt-test/dependenciesJson/test/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/dependenciesJson/test/project/Dependencies.scala +++ b/src/sbt-test/dependenciesJson/test/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { diff --git a/src/sbt-test/schemaVersion/unsupported/project/Dependencies.scala b/src/sbt-test/schemaVersion/unsupported/project/Dependencies.scala index 0ae3888..789b802 100644 --- a/src/sbt-test/schemaVersion/unsupported/project/Dependencies.scala +++ b/src/sbt-test/schemaVersion/unsupported/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { From 845810e6cada1ac53fe7216a86d0f5bba5b614a8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Oct 2025 18:25:53 +0000 Subject: [PATCH 3/4] Add 'Reformat with scalafmt 3.10.1' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 6ae0480..e8e775d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,6 @@ b182120910a953913c4149d2776150384a6dff81 # Scala Steward: Reformat with scalafmt 3.9.7 0c10e60eb1419063ddb73266c05787019178d2ca + +# Scala Steward: Reformat with scalafmt 3.10.1 +0726b5c8550104deb451421f5e6944deda890a91 From 9ea3f033799fed5fdbd6a17a82bb3f91e8d522e2 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 21 Oct 2025 10:23:38 +0200 Subject: [PATCH 4/4] Make lowest tested sbt version 1.6.0 So we can scalafmt the scripted tests as well --- README.md | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7a4cf2f..f016957 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Add the plugin dependency to the file `project/plugins.sbt` using `addSbtPlugin` `addSbtPlugin("com.github.sbt" %% "sbt-sbom" % "0.4.0")` -Note that the minimum supported version of sbt is 1.5.2 (this is what the [scripted](https://www.scala-sbt.org/1.x/docs/Testing-sbt-plugins.html#scripted+test+framework) tests target) +Note that the minimum supported version of sbt is 1.6.0 (this is what the [scripted](https://www.scala-sbt.org/1.x/docs/Testing-sbt-plugins.html#scripted+test+framework) tests target) ### BOM creation diff --git a/build.sbt b/build.sbt index a5ca252..7dee66f 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ lazy val root = (project in file(".")) ) }, scriptedBufferLog := false, - scriptedSbt := "1.5.2", + scriptedSbt := "1.6.0", ) ThisBuild / pomIncludeRepository := { _ =>