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

cleanup deprecations for 0.12.0

This commit is contained in:
Mark Harrah 2012-01-15 12:29:53 -05:00
parent d146c7f84c
commit 64ffd20e15
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/Defaults.scala
View File

@ -48,6 +48,7 @@ object Defaults extends BuildCommon
def buildCore: Seq[Setting[_]] = thisBuildCore ++ globalCore def buildCore: Seq[Setting[_]] = thisBuildCore ++ globalCore
def thisBuildCore: Seq[Setting[_]] = inScope(GlobalScope.copy(project = Select(ThisBuild)))(Seq( def thisBuildCore: Seq[Setting[_]] = inScope(GlobalScope.copy(project = Select(ThisBuild)))(Seq(
managedDirectory <<= baseDirectory(_ / "lib_managed") managedDirectory <<= baseDirectory(_ / "lib_managed")
)) ))
def globalCore: Seq[Setting[_]] = inScope(GlobalScope)(Seq( def globalCore: Seq[Setting[_]] = inScope(GlobalScope)(Seq(
buildDependencies <<= buildDependencies or Classpaths.constructBuildDependencies, buildDependencies <<= buildDependencies or Classpaths.constructBuildDependencies,
@ -479,14 +480,6 @@ object Defaults extends BuildCommon
} }
)) ))
@deprecated("Use `docSetting` instead", "0.11.0") def docTask: Initialize[Task[File]] =
(cacheDirectory, compileInputs, streams, docDirectory, configuration, scaladocOptions) map { (cache, in, s, target, config, options) =>
val d = new Scaladoc(in.config.maxErrors, in.compilers.scalac)
val cp = in.config.classpath.toList - in.config.classesDirectory
d.cached(cache / "doc", nameForSrc(config.name), in.config.sources, cp, target, options, s.log)
target
}
def mainRunTask = run <<= runTask(fullClasspath in Runtime, mainClass in run, runner in run) def mainRunTask = run <<= runTask(fullClasspath in Runtime, mainClass in run, runner in run)
def mainRunMainTask = runMain <<= runMainTask(fullClasspath in Runtime, runner in run) def mainRunMainTask = runMain <<= runMainTask(fullClasspath in Runtime, runner in run)