From 7ad8e9778fdaa23951e239d7472bd5a1944eed9b Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 7 May 2011 22:02:05 -0400 Subject: [PATCH] fix mixed compilation order --- main/actions/AggressiveCompile.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/actions/AggressiveCompile.scala b/main/actions/AggressiveCompile.scala index 39def00ad..c53d30741 100644 --- a/main/actions/AggressiveCompile.scala +++ b/main/actions/AggressiveCompile.scala @@ -75,7 +75,7 @@ class AggressiveCompile(cacheDirectory: File) javac(javaSrcs, absClasspath, outputDirectory, options.javacOptions) } } - if(order == ScalaThenJava) { compileScala(); compileJava() } else { compileJava(); compileScala() } + if(order == JavaThenScala) { compileJava(); compileScala() } else { compileScala(); compileJava() } } val sourcesSet = sources.toSet