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

Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5 

Conflicts:
	main/src/main/scala/sbt/Load.scala
This commit is contained in:
Josh Suereth 2014-05-16 14:04:51 -04:00
parent f402f9ac9e 748ff345a4
commit 7d0b517be2
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,7 +272,7 @@ object Load {
loaders updatePluginManagement PluginManagement.extractOverrides(unit.plugins.fullClasspath) loaders updatePluginManagement PluginManagement.extractOverrides(unit.plugins.fullClasspath)
def addResolvers(unit: sbt.BuildUnit, isRoot: Boolean, loaders: BuildLoader): BuildLoader = def addResolvers(unit: sbt.BuildUnit, isRoot: Boolean, loaders: BuildLoader): BuildLoader =
unit.definitions.builds.flatMap(_.buildLoaders) match { unit.definitions.builds.flatMap(_.buildLoaders).toList match {
case Nil => loaders case Nil => loaders
case x :: xs => case x :: xs =>
import Alternatives._ import Alternatives._

12
sbt/src/sbt-test/project/build-loaders/project/build.scala Normal file
View File

@ -0,0 +1,12 @@
import sbt._
import Keys._
object EmptyLoaderBuild extends Build {
override def buildLoaders = BuildLoader.transform(_.unit) :: Nil
lazy val root = (
project in file(".")
settings(
name := "foo"
)
)
}

2
sbt/src/sbt-test/project/build-loaders/test Normal file
View File

@ -0,0 +1,2 @@
# Just making sure the build compiles is enough of a test.
> name