Merge pull request #11 from maffoo/master

added classDirectory to classpath for gwtCompile command
cdietze · Feb 28, 2012 · 1d73fa8 · 1d73fa8
2 parents 92a1d6b + 0736c04
commit 1d73fa8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git 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(","))