Permalink
Browse files

Revert "use the same logic for selecting extra attributes in addSbtPl…

…ugin as in pluginProjectId"

Doesn't compile.

This reverts commit 8f14df1.
  • Loading branch information...
1 parent 76d2409 commit e37145137fe381e874d5b11b35e6cf849f0b8c46 @harrah committed May 31, 2012
Showing with 2 additions and 6 deletions.
  1. +2 −6 main/Defaults.scala
View
@@ -1235,13 +1235,9 @@ 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 <+= (scalaVersion in update, scalaBinaryVersion in update) { (scalaV, scalaBV) =>
- sbtPluginExtra(dependency, sbtVersion, selectVersion(scalaV, scalaBV))
- }
+ libraryDependencies <+= (scalaBinaryVersion in update) { scalaV => sbtPluginExtra(dependency, sbtVersion, scalaV) }
def addSbtPlugin(dependency: ModuleID): Setting[Seq[ModuleID]] =
- 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))
- }
+ libraryDependencies <+= (sbtBinaryVersion in update,scalaBinaryVersion in update) { (sbtV, scalaV) => sbtPluginExtra(dependency, sbtV, scalaV) }
def compilerPlugin(dependency: ModuleID): ModuleID =
dependency.copy(configurations = Some("plugin->default(compile)"))

0 comments on commit e371451

Please sign in to comment.