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

declare sbt dependency for plugins to be in Provided, ref #80

This commit is contained in:
Mark Harrah 2011-07-03 15:44:53 -04:00
parent 8d61d78c2b
commit 9fb6f20177
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/Defaults.scala
View File

@ -8,7 +8,7 @@ package sbt
import compiler.Discovery import compiler.Discovery
import Project.{inConfig, Initialize, inScope, inTask, ScopedKey, Setting, SettingsDefinition} import Project.{inConfig, Initialize, inScope, inTask, ScopedKey, Setting, SettingsDefinition}
import Artifact.{DocClassifier, SourceClassifier} import Artifact.{DocClassifier, SourceClassifier}
import Configurations.{Compile, CompilerPlugin, IntegrationTest, names, Runtime, Test} import Configurations.{Compile, CompilerPlugin, IntegrationTest, names, Provided, Runtime, Test}
import complete._ import complete._
import std.TaskExtra._ import std.TaskExtra._
import inc.{FileValueCache, Locate} import inc.{FileValueCache, Locate}
@ -600,7 +600,7 @@ object Classpaths
libraryDependencies <++= (autoScalaLibrary, scalaVersion) { (auto, sv) => if(auto) ScalaArtifacts.libraryDependency(sv) :: Nil else Nil}, libraryDependencies <++= (autoScalaLibrary, scalaVersion) { (auto, sv) => if(auto) ScalaArtifacts.libraryDependency(sv) :: Nil else Nil},
allDependencies <<= (projectDependencies,libraryDependencies,sbtPlugin,sbtDependency) map { (projDeps, libDeps, isPlugin, sbtDep) => allDependencies <<= (projectDependencies,libraryDependencies,sbtPlugin,sbtDependency) map { (projDeps, libDeps, isPlugin, sbtDep) =>
val base = projDeps ++ libDeps val base = projDeps ++ libDeps
if(isPlugin) sbtDep +: base else base if(isPlugin) sbtDep.copy(configurations = Some(Provided.name)) +: base else base
}, },
ivyLoggingLevel in GlobalScope :== UpdateLogging.Quiet, ivyLoggingLevel in GlobalScope :== UpdateLogging.Quiet,
ivyXML in GlobalScope :== NodeSeq.Empty, ivyXML in GlobalScope :== NodeSeq.Empty,