From 3671f9db3082e0b96e61e104c9dc5c085f2195ec Mon Sep 17 00:00:00 2001 From: forozco Date: Fri, 12 Jul 2019 09:28:44 -0400 Subject: [PATCH 1/2] ensure format executes after compile --- .../com/palantir/baseline/plugins/BaselineFormat.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 index 62c4dc9ab..ce8f28ced 100644 --- 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); + }); }); } } From bf7b8c585f45815bc5dc095bdc1b35c4c1bdc98f Mon Sep 17 00:00:00 2001 From: forozco Date: Fri, 12 Jul 2019 13:28:44 +0000 Subject: [PATCH 2/2] Add generated changelog entries --- changelog/@unreleased/pr-688.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-688.v2.yml diff --git a/changelog/@unreleased/pr-688.v2.yml b/changelog/@unreleased/pr-688.v2.yml new file mode 100644 index 000000000..f75d7ccf3 --- /dev/null +++ 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