From 57b5b95ae398442ffb2e0218bed3be8f11d79dd9 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 16 Oct 2011 17:27:36 -0400 Subject: [PATCH] Include plugins in update-sbt-classifiers. Fixes #138 --- main/Defaults.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index e465f2927..3d9d00e8e 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -758,8 +758,9 @@ object Classpaths new InlineIvyConfiguration(paths, rs, Nil, Nil, off, Option(lock(app)), check, s.log) }, ivySbt <<= ivySbt0, - classifiersModule <<= (projectID, sbtDependency, transitiveClassifiers) map { ( pid, sbtDep, classifiers) => - GetClassifiersModule(pid, sbtDep :: Nil, Configurations.Default :: Nil, classifiers) + classifiersModule <<= (projectID, sbtDependency, transitiveClassifiers, loadedBuild, thisProjectRef) map { ( pid, sbtDep, classifiers, lb, ref) => + val pluginIDs: Seq[ModuleID] = lb.units(ref.build).unit.plugins.fullClasspath.flatMap(_ get moduleID.key) + GetClassifiersModule(pid, sbtDep +: pluginIDs, Configurations.Default :: Nil, classifiers) }, updateSbtClassifiers in TaskGlobal <<= (ivySbt, classifiersModule, updateConfiguration, ivyScala, target in LocalRootProject, appConfiguration, streams) map { (is, mod, c, ivyScala, out, app, s) =>