Ensure format executes after compile (#688)

Ensure that format tasks execute after compilation
palantir · Jul 12, 2019 · d7ca0b6 · d7ca0b6
1 parent 1395e78
commit d7ca0b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/changelog/@unreleased/pr-688.v2.yml b/changelog/@unreleased/pr-688.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Ensure that format tasks execute after compilation
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/688
diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineFormat.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineFormat.java
@@ -21,6 +21,7 @@
 import org.gradle.api.Task;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.tasks.compile.JavaCompile;
 
 class BaselineFormat extends AbstractBaselinePlugin {
 
@@ -54,7 +55,11 @@ public void apply(Project project) {
 
             // necessary because SpotlessPlugin creates tasks in an afterEvaluate block
             Task formatTask = project.task("format");
-            project.afterEvaluate(p -> formatTask.dependsOn(project.getTasks().getByName("spotlessApply")));
+            project.afterEvaluate(p -> {
+                Task spotlessApply = project.getTasks().getByName("spotlessApply");
+                formatTask.dependsOn(spotlessApply);
+                project.getTasks().withType(JavaCompile.class).configureEach(spotlessApply::mustRunAfter);
+            });
         });
     }
 }