scope transitiveClassifiers by the update*classifiers task using it

This commit is contained in:
Mark Harrah 2011-07-07 22:04:28 -04:00
parent ac4b00c1de
commit 467f6bc486
1 changed files with 2 additions and 2 deletions

View File

@ -645,12 +645,12 @@ object Classpaths
cachedUpdate(cacheDirectory / "update", Project.display(ref), module, config, Some(si), s.log)
},
transitiveClassifiers in GlobalScope :== Seq(SourceClassifier, DocClassifier),
updateClassifiers <<= (ivySbt, projectID, update, transitiveClassifiers, updateConfiguration, ivyScala, target in LocalRootProject, appConfiguration, streams) map { (is, pid, up, classifiers, c, ivyScala, out, app, s) =>
updateClassifiers <<= (ivySbt, projectID, update, transitiveClassifiers in updateClassifiers, updateConfiguration, ivyScala, target in LocalRootProject, appConfiguration, streams) map { (is, pid, up, classifiers, c, ivyScala, out, app, s) =>
withExcludes(out, classifiers, lock(app)) { excludes =>
IvyActions.updateClassifiers(is, GetClassifiersConfiguration(pid, up.allModules, classifiers, excludes, c, ivyScala), s.log)
}
},
updateSbtClassifiers <<= (ivySbt, projectID, transitiveClassifiers, updateConfiguration, sbtDependency, ivyScala, target in LocalRootProject, appConfiguration, streams) map {
updateSbtClassifiers <<= (ivySbt, projectID, transitiveClassifiers in updateSbtClassifiers, updateConfiguration, sbtDependency, ivyScala, target in LocalRootProject, appConfiguration, streams) map {
(is, pid, classifiers, c, sbtDep, ivyScala, out, app, s) =>
withExcludes(out, classifiers, lock(app)) { excludes =>
IvyActions.transitiveScratch(is, "sbt", GetClassifiersConfiguration(pid, sbtDep :: Nil, classifiers, excludes, c, ivyScala), s.log)