From ed042b221968692c9e8a02f063ecf7bd1848c7e0 Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Sun, 31 May 2026 11:09:46 +0900 Subject: [PATCH] [2.0.x] fix: Fixes backtick-quoted project handling (#9277) --- buildfile/src/main/scala/sbt/internal/LoadedSbtFile.scala | 3 ++- .../src/sbt-test/actions/set-kebab-case-project/build.sbt | 8 ++++++++ sbt-app/src/sbt-test/actions/set-kebab-case-project/test | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 sbt-app/src/sbt-test/actions/set-kebab-case-project/build.sbt create mode 100644 sbt-app/src/sbt-test/actions/set-kebab-case-project/test diff --git a/buildfile/src/main/scala/sbt/internal/LoadedSbtFile.scala b/buildfile/src/main/scala/sbt/internal/LoadedSbtFile.scala index 7e7a12fb0..b0a0997d0 100644 --- a/buildfile/src/main/scala/sbt/internal/LoadedSbtFile.scala +++ b/buildfile/src/main/scala/sbt/internal/LoadedSbtFile.scala @@ -11,6 +11,7 @@ package internal import Def.Setting import java.nio.file.Path +import scala.reflect.NameTransformer /** * Represents the exported contents of a .sbt file. Currently, that includes the list of settings, @@ -61,7 +62,7 @@ private[sbt] final class DefinedSbtValues(val sbtFiles: Seq[EvalDefinitions]) { for { file <- sbtFiles m = file.enclosingModule - v <- file.valNames + v <- file.valNames.map(NameTransformer.decode) } yield s"import ${m}.`${v}`" } def generated: Seq[Path] = diff --git a/sbt-app/src/sbt-test/actions/set-kebab-case-project/build.sbt b/sbt-app/src/sbt-test/actions/set-kebab-case-project/build.sbt new file mode 100644 index 000000000..7b63fed3f --- /dev/null +++ b/sbt-app/src/sbt-test/actions/set-kebab-case-project/build.sbt @@ -0,0 +1,8 @@ +// https://github.com/sbt/sbt/issues/9269 +val `kebab-case-project` = rootProject + +InputKey[Unit]("checkVersion") := { + val actual = version.value + val expect = Def.spaceDelimited("").parsed.head + assert(expect == actual, (actual, expect)) +} diff --git a/sbt-app/src/sbt-test/actions/set-kebab-case-project/test b/sbt-app/src/sbt-test/actions/set-kebab-case-project/test new file mode 100644 index 000000000..513d7bc18 --- /dev/null +++ b/sbt-app/src/sbt-test/actions/set-kebab-case-project/test @@ -0,0 +1,3 @@ +> checkVersion 0.1.0-SNAPSHOT +> set version := "0.2.0-SNAPSHOT" +> checkVersion 0.2.0-SNAPSHOT