mirror of https://github.com/sbt/sbt.git
Fix common settings loading
This commit is contained in:
parent
e4b651b3a8
commit
eaada0494d
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue