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

reorganize ignoreMissingUpdate to rely on `updateConfiguration in ignoreMissingUpdate`

This commit is contained in:
Johannes Rudolph 2013-07-22 16:20:56 +02:00
parent 2b20d7fa41
commit 9d373bee73
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala-sbt-0.11/sbt/SbtDependencyGraphCompat.scala
View File

@ -9,11 +9,10 @@ object SbtDependencyGraphCompat {
* to ignore missing artifacts.
*/
def ignoreMissingUpdateT =
ignoreMissingUpdate <<= (ivyModule, thisProjectRef, updateConfiguration, cacheDirectory, scalaInstance, transitiveUpdate, streams) map { (module, ref, config, cacheDirectory, si, reports, s) =>
ignoreMissingUpdate <<= (ivyModule, thisProjectRef, updateConfiguration in ignoreMissingUpdate, cacheDirectory, scalaInstance, transitiveUpdate, streams) map { (module, ref, config, cacheDirectory, si, reports, s) =>
val depsUpdated = reports.exists(!_.stats.cached)
val missingOkConfig = new UpdateConfiguration(config.retrieve, true, config.logging)
Classpaths.cachedUpdate(cacheDirectory / "update", Project.display(ref), module, missingOkConfig, Some(si), depsUpdated, s.log)
Classpaths.cachedUpdate(cacheDirectory / "update", Project.display(ref), module, config, Some(si), depsUpdated, s.log)
}
import complete.DefaultParsers._

5
src/main/scala-sbt-0.12/sbt/SbtDependencyGraphCompat.scala
View File

@ -9,13 +9,12 @@ object SbtDependencyGraphCompat {
* to ignore missing artifacts.
*/
def ignoreMissingUpdateT =
ignoreMissingUpdate <<= (ivyModule, thisProjectRef, updateConfiguration, cacheDirectory, scalaInstance, transitiveUpdate, executionRoots, resolvedScoped, skip in update, streams) map {
ignoreMissingUpdate <<= (ivyModule, thisProjectRef, updateConfiguration in ignoreMissingUpdate, cacheDirectory, scalaInstance, transitiveUpdate, executionRoots, resolvedScoped, skip in update, streams) map {
(module, ref, config, cacheDirectory, si, reports, roots, resolved, skip, s) =>
val depsUpdated = reports.exists(!_.stats.cached)
val isRoot = roots contains resolved
val missingOkConfig = new UpdateConfiguration(config.retrieve, true, config.logging)
Classpaths.cachedUpdate(cacheDirectory / "update", Project.display(ref), module, missingOkConfig, Some(si), skip = skip, force = isRoot, depsUpdated = depsUpdated, log = s.log)
Classpaths.cachedUpdate(cacheDirectory / "update", Project.display(ref), module, config, Some(si), skip = skip, force = isRoot, depsUpdated = depsUpdated, log = s.log)
} tag(Tags.Update, Tags.Network)
def getTerminalWidth: Int = JLine.usingTerminal(_.getTerminalWidth)

1
src/main/scala/net/virtualvoid/sbt/graph/Plugin.scala
View File

@ -79,6 +79,7 @@ object Plugin extends sbt.Plugin {
(c: String) => file("%s/cache/%s-%s-%s.xml" format (home, projectID.organization, crossName(ivyModule), c))
}
},
updateConfiguration in ignoreMissingUpdate <<= updateConfiguration(config => new UpdateConfiguration(config.retrieve, true, config.logging)),
SbtDependencyGraphCompat.ignoreMissingUpdateT,
filterScalaLibrary in Global := true
) ++ Seq(Compile, Test, Runtime, Provided, Optional).flatMap(ivyReportForConfig)