From 8f14df193062e079f0caee43dbd586256ae43e76 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Wed, 30 May 2012 11:10:39 +0200 Subject: [PATCH] use the same logic for selecting extra attributes in addSbtPlugin as in pluginProjectId This enables us to use the same plugins.sbt in projects for release and pre-release versions of sbt. --- main/Defaults.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index 6ea7b5991..463d7bda9 100755 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -1225,9 +1225,13 @@ trait BuildExtra extends BuildCommon def addSbtPlugin(dependency: ModuleID, sbtVersion: String, scalaVersion: String): Setting[Seq[ModuleID]] = libraryDependencies += sbtPluginExtra(dependency, sbtVersion, scalaVersion) def addSbtPlugin(dependency: ModuleID, sbtVersion: String): Setting[Seq[ModuleID]] = - libraryDependencies <+= (scalaBinaryVersion in update) { scalaV => sbtPluginExtra(dependency, sbtVersion, scalaV) } + libraryDependencies <+= (scalaVersion in update, scalaBinaryVersion in update) { (scalaV, scalaBV) => + sbtPluginExtra(dependency, sbtVersion, selectVersion(scalaV, scalaBV)) + } def addSbtPlugin(dependency: ModuleID): Setting[Seq[ModuleID]] = - libraryDependencies <+= (sbtBinaryVersion in update,scalaBinaryVersion in update) { (sbtV, scalaV) => sbtPluginExtra(dependency, sbtV, scalaV) } + libraryDependencies <+= (sbtVersion in update, sbtBinaryVersion in update, scalaVersion in update, scalaBinaryVersion in update) { (sbtV, sbtBV, scalaV, scalaBV) => + sbtPluginExtra(dependency, selectVersion(sbtV, sbtBV), selectVersion(scalaV, scalaBV)) + } def compilerPlugin(dependency: ModuleID): ModuleID = dependency.copy(configurations = Some("plugin->default(compile)"))