From 467f6bc486bcee6738dfc2aa6e40b8aa3c8203ef Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 7 Jul 2011 22:04:28 -0400 Subject: [PATCH] scope transitiveClassifiers by the update*classifiers task using it --- main/Defaults.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index f75f5cee8..0ecda90f6 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -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)