From 0736c045ac66113a7f0e8873dc71e459aef8856c Mon Sep 17 00:00:00 2001 From: Matthew Neeley Date: Mon, 27 Feb 2012 21:24:10 -0800 Subject: [PATCH] added compiled class directory to classpath for gwtCompile --- src/main/scala/GwtPlugin.scala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/scala/GwtPlugin.scala b/src/main/scala/GwtPlugin.scala index 0448fcc..a6f819f 100644 --- a/src/main/scala/GwtPlugin.scala +++ b/src/main/scala/GwtPlugin.scala @@ -77,10 +77,13 @@ object GwtPlugin extends Plugin { } }, - gwtCompile <<= (dependencyClasspath in Gwt, thisProject in Gwt, state in Gwt, javaSource in Compile, javaOptions in Gwt, + gwtCompile <<= (classDirectory in Compile, dependencyClasspath in Gwt, thisProject in Gwt, state in Gwt, javaSource in Compile, javaOptions in Gwt, gwtModules, gwtTemporaryPath, streams) map { - (dependencyClasspath, thisProject, pstate, javaSource, javaOpts, gwtModules, warPath, s) => { - val cp = (dependencyClasspath.map(_.data.absolutePath) :+ javaSource.absolutePath) ++ getDepSources(thisProject.dependencies, pstate) + (classDirectory, dependencyClasspath, thisProject, pstate, javaSource, javaOpts, gwtModules, warPath, s) => { + val cp = Seq(classDirectory.absolutePath) ++ + dependencyClasspath.map(_.data.absolutePath) ++ + Seq(javaSource.absolutePath) ++ + getDepSources(thisProject.dependencies, pstate) val command = mkGwtCommand( cp, javaOpts, "com.google.gwt.dev.Compiler", warPath, Nil, gwtModules.mkString(" ")) s.log.info("Compiling GWT modules: " + gwtModules.mkString(","))