Enable incremental mode by default, fix Mixed compile order

Author: slandelle

src/it/test_directory_with_class_name/pom.xml

@@ -30,15 +30,15 @@
 					<artifactId>@project.artifactId@</artifactId>
 					<version>@project.version@</version>
 					<configuration>
-						<!--recompileMode>incremental</recompileMode-->
+						<recompileMode>all</recompileMode>
 						<args>
-							<arg>-target:jvm-1.7</arg>
+							<arg>-target:jvm-1.8</arg>
 						</args>
 						<javacArgs>
 							<javacArg>-source</javacArg>
-							<javacArg>1.7</javacArg>
+							<javacArg>1.8</javacArg>
 							<javacArg>-target</javacArg>
-							<javacArg>1.7</javacArg>
+							<javacArg>1.8</javacArg>
 						</javacArgs>
           			</configuration>
 				</plugin>

src/main/java/sbt_inc/SbtIncrementalCompiler.java

@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class SbtIncrementalCompiler {
 
@@ -58,7 +59,7 @@ public SbtIncrementalCompiler(File libraryJar, File reflectJar, File compilerJar
 
         compiler = new IncrementalCompilerImpl();
 
-        AnalyzingCompiler scalaCompiler = new AnalyzingCompiler(
+        ScalaCompiler scalaCompiler = new AnalyzingCompiler(
             scalaInstance, // scalaInstance
             ZincCompilerUtil.constantBridgeProvider(scalaInstance, compilerBridgeJar), //provider
             ClasspathOptionsUtil.auto(), // classpathOptions
@@ -99,9 +100,14 @@ public DefinesClass definesClass(File classpathEntry) {
     }
 
     public void compile(List<String> classpathElements, List<File> sources, File classesDirectory, List<String> scalacOptions, List<String> javacOptions) {
+        List<File> fullClasspath = new ArrayList<>();
+        fullClasspath.add(classesDirectory);
+        for (String classpathElement : classpathElements) {
+            fullClasspath.add(new File(classpathElement));
+        }
 
         Inputs inputs = compiler.inputs(
-            classpathElements.stream().map(File::new).toArray(size -> new File[size]), //classpath
+            fullClasspath.toArray(new File[]{}), //classpath
             sources.toArray(new File[]{}), // sources
             classesDirectory, // classesDirectory
             scalacOptions.toArray(new String[]{}), // scalacOptions

src/main/java/scala_maven/ScalaCompilerSupport.java

@@ -16,8 +16,17 @@
 */
 public abstract class ScalaCompilerSupport extends ScalaSourceMojoSupport {
 
-    public static final String ALL = "all";
-    public static final String INCREMENTAL = "incremental";
+    public enum RecompileMode {
+        /**
+         * all sources are recompiled
+         */
+        all,
+
+        /**
+         * incrementally recompile modified sources and other affected sources
+         */
+        incremental
+    }
 
     /**
     * Keeps track of if we get compile errors in incremental mode
@@ -26,14 +35,10 @@ public abstract class ScalaCompilerSupport extends ScalaSourceMojoSupport {
 
     /**
     * Recompile mode to use when sources were previously compiled and there is at
-    * least one change:
-    * "all" => all sources are recompiled,
-    * "incremental" => incrementally recompile modified sources and other affected
-    * sources.
-    *
+    * least one change, see {@link RecompileMode}.
     */
-    @Parameter(property = "recompileMode", defaultValue = "all")
-    protected String recompileMode = ALL;
+    @Parameter(property = "recompileMode", defaultValue = "incremental")
+    protected RecompileMode recompileMode;
 
     /**
     * notifyCompilation if true then print a message "path: compiling"
@@ -43,7 +48,7 @@ public abstract class ScalaCompilerSupport extends ScalaSourceMojoSupport {
     *
     */
     @Parameter(property = "notifyCompilation", defaultValue = "true")
-    private boolean notifyCompilation = true;
+    private boolean notifyCompilation;
 
     abstract protected File getOutputDir() throws Exception;
 
@@ -90,13 +95,9 @@ protected void doExecute() throws Exception {
     }
 
     protected int compile(List<File> sourceRootDirs, File outputDir, File analysisCacheFile, List<String> classpathElements, boolean compileInLoop) throws Exception, InterruptedException {
-        if (!compileInLoop && INCREMENTAL.equals(recompileMode)) {
-            // TODO - Do we really need this duplicated here?
-            if (!outputDir.exists()) {
-                outputDir.mkdirs();
-            }
+        if (!compileInLoop && recompileMode == RecompileMode.incremental) {
             // if not compileInLoop, invoke incrementalCompile immediately
-            return incrementalCompile(classpathElements, sourceRootDirs, outputDir, analysisCacheFile, compileInLoop);
+            return incrementalCompile(classpathElements, sourceRootDirs, outputDir, analysisCacheFile, false);
         }
 
         long t0 = System.currentTimeMillis();
@@ -119,7 +120,7 @@ protected int compile(List<File> sourceRootDirs, File outputDir, File analysisCa
         }
         long t1 = System.currentTimeMillis();
 
-        if (compileInLoop && INCREMENTAL.equals(recompileMode)) {
+        if (compileInLoop && recompileMode == RecompileMode.incremental) {
             // if compileInLoop, do not invoke incrementalCompile when there's no change
             int retCode = incrementalCompile(classpathElements, sourceRootDirs, outputDir, analysisCacheFile, compileInLoop);
             _lastCompileAt = t1;
@@ -173,7 +174,7 @@ protected List<File> getFilesToCompile(List<File> sourceRootDirs, long lastSucce
         //   (restore how it work in 2.11 and failed in 2.12)
         //TODO a better behavior : if there is at least one .scala to compile then add all .java, if there is at least one .java then add all .scala (because we don't manage class dependency)
         List<File> files = new ArrayList<>(sourceFiles.size());
-        if (_lastCompileAt > 0 || (!ALL.equals(recompileMode) && (lastSuccessfullCompileTime > 0))) {
+        if (_lastCompileAt > 0 || (recompileMode != RecompileMode.all && (lastSuccessfullCompileTime > 0))) {
             ArrayList<File> modifiedScalaFiles = new ArrayList<File>(sourceFiles.size());
             ArrayList<File> modifiedJavaFiles = new ArrayList<File>(sourceFiles.size());
             ArrayList<File> allJavaFiles = new ArrayList<File>(sourceFiles.size());
@@ -252,6 +253,11 @@ protected int incrementalCompile(List<String> classpathElements, List<File> sour
             return -1;
         }
 
+        // TODO - Do we really need this duplicated here?
+        if (!outputDir.exists()) {
+            outputDir.mkdirs();
+        }
+
         if (incremental == null) {
             File libraryJar = getLibraryJar();
             File reflectJar = getReflectJar();

src/main/java/scala_maven/ScalaContinuousCompileMojo.java

@@ -137,7 +137,7 @@ protected final void doExecute() throws Exception {
         analysisCacheFile = FileUtils.fileOf(analysisCacheFile, useCanonicalPath);
         testAnalysisCacheFile = FileUtils.fileOf(testAnalysisCacheFile, useCanonicalPath);
 
-        if (useFsc && !INCREMENTAL.equals(recompileMode)) {
+        if (useFsc && recompileMode != RecompileMode.incremental) {
             getLog().info("use fsc for compilation");
             scalaClassName = "scala.tools.nsc.CompileClient";
             if (!once) {