From 0e009b14800791b1f8bb984c529f950c26f9f316 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 27 Jun 2013 14:12:36 -0400 Subject: [PATCH] Exclude class directories from plugin classpath used for updateSbtClassifiers: classified jars not available Fixes #798. --- main/src/main/scala/sbt/Defaults.scala | 4 +++- .../update-sbt-classifiers/project/plugins.sbt | 4 +--- .../update-sbt-classifiers/{pending => test} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename sbt/src/sbt-test/dependency-management/update-sbt-classifiers/{pending => test} (100%) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index b48b40c28..6d758f09a 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1061,7 +1061,9 @@ object Classpaths ivyConfiguration := new InlineIvyConfiguration(ivyPaths.value, externalResolvers.value, Nil, Nil, offline.value, Option(lock(appConfiguration.value)), checksums.value, Some(target.value / "resolution-cache"), streams.value.log), ivySbt <<= ivySbt0, 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) + val pluginClasspath = lb.units(ref.build).unit.plugins.fullClasspath + val pluginJars = pluginClasspath.filter(_.data.isFile) // exclude directories: an approximation to whether they've been published + val pluginIDs: Seq[ModuleID] = pluginJars.flatMap(_ get moduleID.key) GetClassifiersModule(pid, sbtDep +: pluginIDs, Configurations.Default :: Nil, classifiers) }, updateSbtClassifiers in TaskGlobal <<= (ivySbt, classifiersModule, updateConfiguration, ivyScala, appConfiguration, streams) map { diff --git a/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/project/plugins.sbt b/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/project/plugins.sbt index 9f603b4d6..b749d93bc 100644 --- a/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/project/plugins.sbt +++ b/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/project/plugins.sbt @@ -1,3 +1 @@ -resolvers += Resolver.url("sbt-plugin-snapshots", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns) - -addSbtPlugin("com.eed3si9n" % "sbt-twt" % "0.2.1", sbtVersion = "0.12", scalaVersion = "2.9.2") \ No newline at end of file +libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/pending b/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/test similarity index 100% rename from sbt/src/sbt-test/dependency-management/update-sbt-classifiers/pending rename to sbt/src/sbt-test/dependency-management/update-sbt-classifiers/test