luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[2.x] fix: Fixes a/build.sbt leakage (#9519) 

**Problem**
subproject build.sbt like a/build.sbt leaks to siblings.

**Solution**
Don't forward freshly computed common settings unless
the build.sbt is at root.
This commit is contained in:
eugene yokota 2026-07-27 15:43:20 -04:00 committed by GitHub
parent 1e2f70601b
commit ab340b02bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/scala/sbt/internal/Load.scala
View File

@ -1129,7 +1129,9 @@ private[sbt] object Load {
val newProjects = rest ++ discovered ++ projectLevelExtra val newProjects = rest ++ discovered ++ projectLevelExtra
val newAcc = acc :+ finalRoot val newAcc = acc :+ finalRoot
val newGenerated = generated ++ generatedConfigClassFiles val newGenerated = generated ++ generatedConfigClassFiles
loadTransitive1(newProjects, newAcc, newGenerated, finalRoot.commonSettings) // only root-level settings are build-wide; a submodule's own settings must not leak to siblings (#9517).
val cs = if isRootPath(p.base, buildBase) then finalRoot.commonSettings else commonSettings
loadTransitive1(newProjects, newAcc, newGenerated, cs)
} }
// Load all config files AND process the project at the root directory, if it exists. // Load all config files AND process the project at the root directory, if it exists.

11
sbt-app/src/sbt-test/project/common-settings/build.sbt
View File

@ -1,3 +1,4 @@
@transient
lazy val check = taskKey[Unit]("") lazy val check = taskKey[Unit]("")
def scala212 = "2.12.21" def scala212 = "2.12.21"
@ -5,8 +6,8 @@ scalaVersion := scala212
val o = "com.example" val o = "com.example"
organization := o organization := o
lazy val root = (project in file(".")) lazy val root = rootProject
.aggregate(foo, bar, baz) .autoAggregate
lazy val foo = project lazy val foo = project
lazy val bar = project lazy val bar = project
@ -16,12 +17,14 @@ lazy val bar = project
) )
lazy val baz = project lazy val baz = project
lazy val qux = project
check := { LocalRootProject / check := {
assert((root / scalaVersion).value == scala212) assert((root / scalaVersion).value == scala212)
assert((foo / scalaVersion).value == scala212) assert((foo / scalaVersion).value == scala212)
assert((bar / scalaVersion).value == scala212) assert((bar / scalaVersion).value == scala212)
assert((baz / scalaVersion).value == scala212) assert((baz / scalaVersion).value == scala212)
assert((qux / scalaVersion).value == scala212)
assert((root / organization).value == o, s"(root / organization).value: ${(root / organization).value}") assert((root / organization).value == o, s"(root / organization).value: ${(root / organization).value}")
assert((foo / organization).value == o, s"(foo / organization).value: ${(foo / organization).value}") assert((foo / organization).value == o, s"(foo / organization).value: ${(foo / organization).value}")
@ -29,5 +32,7 @@ check := {
assert((bar / organization).value == "com.example.bar") assert((bar / organization).value == "com.example.bar")
// Test that baz/build.sbt bare settings get loaded // Test that baz/build.sbt bare settings get loaded
assert((baz / organization).value == "com.example.baz") assert((baz / organization).value == "com.example.baz")
// Test that baz/build.sbt settings don't leak onto qux, processed right after it (#9517)
assert((qux / organization).value == o, s"(qux / organization).value: ${(qux / organization).value}")
} }
check / aggregate := false check / aggregate := false