From d7ca0e33963f00f42f184c79cbc2e4e8b39a29bd Mon Sep 17 00:00:00 2001 From: forozco Date: Thu, 1 Aug 2019 11:16:30 +0100 Subject: [PATCH 1/4] fix spotless apply with eclipse config --- .../com/palantir/baseline/plugins/BaselineFormat.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 cd3b5e579..47c16c03d 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 @@ -63,11 +63,11 @@ public void apply(Project project) { // necessary because SpotlessPlugin creates tasks in an afterEvaluate block Task formatTask = project.task("format"); - if (eclipseFormattingEnabled(project) && !Files.exists(eclipseXml)) { - formatTask.dependsOn(project.getTasks().findByPath(":baselineUpdateConfig")); - } project.afterEvaluate(p -> { Task spotlessApply = project.getTasks().getByName("spotlessApply"); + if (eclipseFormattingEnabled(project) && !Files.exists(eclipseXml)) { + spotlessApply.dependsOn(project.getTasks().findByPath(":baselineUpdateConfig")); + } formatTask.dependsOn(spotlessApply); project.getTasks().withType(JavaCompile.class).configureEach(spotlessApply::mustRunAfter); }); From 97d5b74b309e65918e58f4c69d5f86e403e4ba76 Mon Sep 17 00:00:00 2001 From: forozco Date: Thu, 1 Aug 2019 10:16:30 +0000 Subject: [PATCH 2/4] Add generated changelog entries --- changelog/@unreleased/pr-724.v2.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/@unreleased/pr-724.v2.yml diff --git a/changelog/@unreleased/pr-724.v2.yml b/changelog/@unreleased/pr-724.v2.yml new file mode 100644 index 000000000..df86da240 --- /dev/null +++ b/changelog/@unreleased/pr-724.v2.yml @@ -0,0 +1,6 @@ +type: fix +fix: + description: Correctly set dependency between spotlessApply and baselineUpdateConfig + to prevent a race + links: + - https://github.com/palantir/gradle-baseline/pull/724 From 68ab097dadc6bc45a75696e105056df58948598a Mon Sep 17 00:00:00 2001 From: forozco Date: Thu, 1 Aug 2019 11:28:09 +0100 Subject: [PATCH 3/4] refrence correct task --- .../com/palantir/baseline/plugins/BaselineFormat.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 47c16c03d..8a367371e 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 @@ -64,12 +64,12 @@ public void apply(Project project) { // necessary because SpotlessPlugin creates tasks in an afterEvaluate block Task formatTask = project.task("format"); project.afterEvaluate(p -> { - Task spotlessApply = project.getTasks().getByName("spotlessApply"); + Task spotlessJava = project.getTasks().getByName("spotlessJava"); if (eclipseFormattingEnabled(project) && !Files.exists(eclipseXml)) { - spotlessApply.dependsOn(project.getTasks().findByPath(":baselineUpdateConfig")); + spotlessJava.dependsOn(project.getTasks().findByPath(":baselineUpdateConfig")); } - formatTask.dependsOn(spotlessApply); - project.getTasks().withType(JavaCompile.class).configureEach(spotlessApply::mustRunAfter); + formatTask.dependsOn(spotlessJava); + project.getTasks().withType(JavaCompile.class).configureEach(spotlessJava::mustRunAfter); }); }); } From bfa3b7cf0eabd1118b01782f7411723f0bfd361d Mon Sep 17 00:00:00 2001 From: forozco Date: Thu, 1 Aug 2019 13:47:09 +0100 Subject: [PATCH 4/4] fix --- .../groovy/com/palantir/baseline/plugins/BaselineFormat.java | 3 ++- 1 file changed, 2 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 8a367371e..449bc6540 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 @@ -65,10 +65,11 @@ public void apply(Project project) { Task formatTask = project.task("format"); project.afterEvaluate(p -> { Task spotlessJava = project.getTasks().getByName("spotlessJava"); + Task spotlessApply = project.getTasks().getByName("spotlessApply"); if (eclipseFormattingEnabled(project) && !Files.exists(eclipseXml)) { spotlessJava.dependsOn(project.getTasks().findByPath(":baselineUpdateConfig")); } - formatTask.dependsOn(spotlessJava); + formatTask.dependsOn(spotlessApply); project.getTasks().withType(JavaCompile.class).configureEach(spotlessJava::mustRunAfter); }); });