From eaada0494da4514df37bf704cbf5375a0d3cfe64 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 25 Jan 2026 01:29:09 -0500 Subject: [PATCH] Fix common settings loading --- main/src/main/scala/sbt/internal/Load.scala | 2 +- sbt-app/src/sbt-test/project/common-settings/build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala index c6a2fd4ac..1bf7e4490 100755 --- a/main/src/main/scala/sbt/internal/Load.scala +++ b/main/src/main/scala/sbt/internal/Load.scala @@ -1073,7 +1073,7 @@ private[sbt] object Load { val newProjects = rest ++ discovered ++ projectLevelExtra val newAcc = acc :+ finalRoot 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. diff --git a/sbt-app/src/sbt-test/project/common-settings/build.sbt b/sbt-app/src/sbt-test/project/common-settings/build.sbt index 651eacbaa..dc831a023 100644 --- a/sbt-app/src/sbt-test/project/common-settings/build.sbt +++ b/sbt-app/src/sbt-test/project/common-settings/build.sbt @@ -23,8 +23,8 @@ check := { assert((bar / scalaVersion).value == scala212) assert((baz / scalaVersion).value == scala212) - assert((root / organization).value == o) - assert((foo / organization).value == o) + assert((root / organization).value == o, s"(root / organization).value: ${(root / organization).value}") + assert((foo / organization).value == o, s"(foo / organization).value: ${(foo / organization).value}") // Test that bar can override common setting in settings(...) assert((bar / organization).value == "com.example.bar") // Test that baz/build.sbt bare settings get loaded