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

Fix common settings loading

This commit is contained in:
Eugene Yokota 2026-01-25 01:29:09 -05:00
parent e4b651b3a8
commit eaada0494d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1073,7 +1073,7 @@ 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) loadTransitive1(newProjects, newAcc, newGenerated, commonSettings)
} }
// 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.

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

@ -23,8 +23,8 @@ check := {
assert((bar / scalaVersion).value == scala212) assert((bar / scalaVersion).value == scala212)
assert((baz / scalaVersion).value == scala212) assert((baz / scalaVersion).value == scala212)
assert((root / organization).value == o) assert((root / organization).value == o, s"(root / organization).value: ${(root / organization).value}")
assert((foo / organization).value == o) assert((foo / organization).value == o, s"(foo / organization).value: ${(foo / organization).value}")
// Test that bar can override common setting in settings(...) // Test that bar can override common setting in settings(...)
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