From e95feccfca577ccebe60f1d361bffeb476fb8d90 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Fri, 16 May 2014 07:40:00 -0400 Subject: [PATCH] Fix pattern match on buildLoaders. Fixes #1341 --- main/src/main/scala/sbt/Load.scala | 2 +- .../project/build-loaders/project/build.scala | 12 ++++++++++++ sbt/src/sbt-test/project/build-loaders/test | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 sbt/src/sbt-test/project/build-loaders/project/build.scala create mode 100644 sbt/src/sbt-test/project/build-loaders/test diff --git a/main/src/main/scala/sbt/Load.scala b/main/src/main/scala/sbt/Load.scala index 36d39232a..dbede15e3 100755 --- a/main/src/main/scala/sbt/Load.scala +++ b/main/src/main/scala/sbt/Load.scala @@ -270,7 +270,7 @@ object Load loaders updatePluginManagement PluginManagement.extractOverrides(unit.plugins.fullClasspath) 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 x :: xs => diff --git a/sbt/src/sbt-test/project/build-loaders/project/build.scala b/sbt/src/sbt-test/project/build-loaders/project/build.scala new file mode 100644 index 000000000..6110bafef --- /dev/null +++ b/sbt/src/sbt-test/project/build-loaders/project/build.scala @@ -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" + ) + ) +} \ No newline at end of file diff --git a/sbt/src/sbt-test/project/build-loaders/test b/sbt/src/sbt-test/project/build-loaders/test new file mode 100644 index 000000000..e4529e533 --- /dev/null +++ b/sbt/src/sbt-test/project/build-loaders/test @@ -0,0 +1,2 @@ +# Just making sure the build compiles is enough of a test. +> name \ No newline at end of file