Ignore missing source roots for incremental compilation

Fixes #8194
gradle · Jan 9, 2019 · 0278359 · 0278359
1 parent 7bd366f
commit 0278359
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/...rg/gradle/java/compile/incremental/SourceIncrementalJavaCompilationIntegrationTest.groovy b/...rg/gradle/java/compile/incremental/SourceIncrementalJavaCompilationIntegrationTest.groovy
@@ -569,6 +569,25 @@ sourceSets {
         output.contains("Full recompilation is required because the source roots could not be inferred.")
     }
 
+    def "missing files are ignored of source roots"() {
+        buildFile << "compileJava.source([file('extra-java'), file('other'), fileTree('missing-tree'), file('missing-file')])"
+
+        java("class A extends B {}")
+        file("extra-java/B.java") << "class B {}"
+        file("extra-java/C.java") << "class C {}"
+
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        file("extra-java/B.java").text = "class B { String change; }"
+        executer.withArgument "--info"
+        run "compileJava"
+
+        then:
+        outputs.recompiledClasses("A", "B")
+        !output.contains("Full recompilation is required because the source roots could not be inferred.")
+    }
+
     def "handles duplicate class across source directories"() {
         //compiler does not allow this scenario, documenting it here
         buildFile << "sourceSets.main.java.srcDir 'java'"

diff --git a/.../java/org/gradle/api/internal/tasks/compile/incremental/recomp/CompilationSourceDirs.java b/.../java/org/gradle/api/internal/tasks/compile/incremental/recomp/CompilationSourceDirs.java
@@ -78,10 +78,12 @@ public void visitGenericFileTree(FileTreeInternal fileTree) {
 
         @Override
         public void visitFileTree(File root, PatternSet patterns) {
-            if (root.isDirectory()) {
-                sourceRoots.add(root);
-            } else {
-                cannotInferSourceRoots("file '" + root + "'");
+            if (root.exists()) {
+                if (root.isDirectory()) {
+                    sourceRoots.add(root);
+                } else {
+                    cannotInferSourceRoots("file '" + root + "'");
+                }
             }
         }