luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use extra attributes for sbt, Scala version of sbt plugins

This commit is contained in:
Mark Harrah 2011-07-23 23:07:54 -04:00
parent f0a9305ba2
commit cc10940813
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/Defaults.scala
View File

@ -431,6 +431,7 @@ object Defaults extends BuildCommon
Compiler.inputs(classpath, srcs, classes, scalacOpts, javacOpts, 100, order)(cs, incSetup, s.log) Compiler.inputs(classpath, srcs, classes, scalacOpts, javacOpts, 100, order)(cs, incSetup, s.log)
} }
def sbtPluginExtra(m: ModuleID, sbtV: String, scalaV: String): ModuleID = m.extra("e:sbtVersion" -> sbtV, "e:scalaVersion" -> scalaV).copy(crossVersion = false)
def writePluginsDescriptor(plugins: Set[String], dir: File): List[File] = def writePluginsDescriptor(plugins: Set[String], dir: File): List[File] =
{ {
val descriptor: File = dir / "sbt" / "sbt.plugins" val descriptor: File = dir / "sbt" / "sbt.plugins"
@ -622,6 +623,7 @@ object Classpaths
projectID <<= (organization,moduleName,version,artifacts,crossPaths){ (org,module,version,as,crossEnabled) => projectID <<= (organization,moduleName,version,artifacts,crossPaths){ (org,module,version,as,crossEnabled) =>
ModuleID(org, module, version).cross(crossEnabled).artifacts(as : _*) ModuleID(org, module, version).cross(crossEnabled).artifacts(as : _*)
}, },
projectID <<= pluginProjectID,
resolvers in GlobalScope :== Nil, resolvers in GlobalScope :== Nil,
projectDescriptors <<= depMap, projectDescriptors <<= depMap,
retrievePattern in GlobalScope :== "[type]s/[organisation]/[module]/[artifact](-[revision])(-[classifier]).[ext]", retrievePattern in GlobalScope :== "[type]s/[organisation]/[module]/[artifact](-[revision])(-[classifier]).[ext]",
@ -663,6 +665,9 @@ object Classpaths
IvySbt.substituteCross(base, app.provider.scalaProvider.version).copy(crossVersion = false) IvySbt.substituteCross(base, app.provider.scalaProvider.version).copy(crossVersion = false)
} }
) )
def pluginProjectID: Initialize[ModuleID] = (sbtVersion, scalaVersion, projectID, sbtPlugin) { (sbtV, scalaV, pid, isPlugin) =>
if(isPlugin) sbtPluginExtra(pid, sbtV, scalaV) else pid
}
def ivySbt0: Initialize[Task[IvySbt]] = def ivySbt0: Initialize[Task[IvySbt]] =
(ivyConfiguration, credentials, streams) map { (conf, creds, s) => (ivyConfiguration, credentials, streams) map { (conf, creds, s) =>
Credentials.register(creds, s.log) Credentials.register(creds, s.log)
@ -952,6 +957,9 @@ trait BuildExtra extends BuildCommon
{ {
import Defaults._ import Defaults._
def addSbtPlugin(dependency: ModuleID): Setting[Seq[ModuleID]] =
libraryDependencies <+= (sbtVersion,scalaVersion) { (sbtV, scalaV) => sbtPluginExtra(dependency, sbtV, scalaV) }
def compilerPlugin(dependency: ModuleID): ModuleID = def compilerPlugin(dependency: ModuleID): ModuleID =
dependency.copy(configurations = Some("plugin->default(compile)")) dependency.copy(configurations = Some("plugin->default(compile)"))