From 5d353b411336ef3f83ee097948803cc2bc944e61 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 25 Jul 2011 21:38:01 -0400 Subject: [PATCH] lookup sbt version in 'update' to allow using binary plugins with nightlies --- main/Defaults.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index ea7884d9f..81f41c5bf 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -666,7 +666,7 @@ object Classpaths IvySbt.substituteCross(base, app.provider.scalaProvider.version).copy(crossVersion = false) } ) - def pluginProjectID: Initialize[ModuleID] = (sbtVersion, scalaVersion, projectID, sbtPlugin) { (sbtV, scalaV, pid, isPlugin) => + def pluginProjectID: Initialize[ModuleID] = (sbtVersion in update, scalaVersion, projectID, sbtPlugin) { (sbtV, scalaV, pid, isPlugin) => if(isPlugin) sbtPluginExtra(pid, sbtV, scalaV) else pid } def ivySbt0: Initialize[Task[IvySbt]] = @@ -962,7 +962,7 @@ trait BuildExtra extends BuildCommon import Defaults._ def addSbtPlugin(dependency: ModuleID): Setting[Seq[ModuleID]] = - libraryDependencies <+= (sbtVersion,scalaVersion) { (sbtV, scalaV) => sbtPluginExtra(dependency, sbtV, scalaV) } + libraryDependencies <+= (sbtVersion in update,scalaVersion) { (sbtV, scalaV) => sbtPluginExtra(dependency, sbtV, scalaV) } def compilerPlugin(dependency: ModuleID): ModuleID = dependency.copy(configurations = Some("plugin->default(compile)"))