From 1f1067b4830533615a724bb2634c982067a6392f Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 23 Feb 2016 20:15:24 +0100 Subject: [PATCH] Add support for sbt.override.build.repos flag Fixes https://github.com/alexarchambault/coursier/issues/134 --- .../src/main/scala-2.10/coursier/Tasks.scala | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/plugin/src/main/scala-2.10/coursier/Tasks.scala b/plugin/src/main/scala-2.10/coursier/Tasks.scala index 3804105c0..96582b6fd 100644 --- a/plugin/src/main/scala-2.10/coursier/Tasks.scala +++ b/plugin/src/main/scala-2.10/coursier/Tasks.scala @@ -23,15 +23,24 @@ import scalaz.concurrent.{ Task, Strategy } object Tasks { - def coursierResolversTask: Def.Initialize[sbt.Task[Seq[Resolver]]] = Def.task { - var resolvers = externalResolvers.value - if (sbtPlugin.value) - resolvers = Seq( - sbtResolver.value, - Classpaths.sbtPluginReleases - ) ++ resolvers - resolvers - } + def coursierResolversTask: Def.Initialize[sbt.Task[Seq[Resolver]]] = + ( + externalResolvers, + sbtPlugin, + sbtResolver, + bootResolvers, + overrideBuildResolvers + ).map { (extRes, isSbtPlugin, sbtRes, bootResOpt, overrideFlag) => + bootResOpt.filter(_ => overrideFlag).getOrElse { + var resolvers = extRes + if (isSbtPlugin) + resolvers = Seq( + sbtRes, + Classpaths.sbtPluginReleases + ) ++ resolvers + resolvers + } + } def coursierProjectTask: Def.Initialize[sbt.Task[Project]] = (