From ad0cbc177b9bbf053bf2a9512fb362f756d48df9 Mon Sep 17 00:00:00 2001 From: dmharrah Date: Sun, 5 Jul 2009 23:29:28 +0000 Subject: [PATCH] Fixed problem where dependencies of `sbt` plugins were not on the plugin compile classpath git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@841 d89573ee-9141-11dd-94d4-bdf5e562f29c --- src/main/scala/sbt/BuilderProject.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala index b5d04bf87..ebdf8372b 100644 --- a/src/main/scala/sbt/BuilderProject.scala +++ b/src/main/scala/sbt/BuilderProject.scala @@ -181,7 +181,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, managedSourcePath / name.substring(0, name.length - ".jar".length) } def plugins = descendents(managedDependencyPath, jarFilter) - def pluginClasspath = plugins +++ pluginCompileConfiguration.outputDirectory + def pluginClasspath: PathFinder = plugins +++ pluginCompileConfiguration.outputDirectory lazy val pluginCompileConditional = new BuilderCompileConditional(pluginCompileConfiguration, "plugin") lazy val pluginCompileConfiguration = @@ -190,7 +190,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, def label = "plugin builder" def sources = descendents(managedSourcePath, sourceFilter) def outputDirectory = outputPath / "plugin-classes" - def classpath = sbtJarPath + def classpath: PathFinder = pluginClasspath +++ sbtJarPath def analysisPath = outputPath / "plugin-analysis" } }