Skip to content

Commit 6b9fffb

Browse files
committed
Fix issue #506.
1 parent efa0174 commit 6b9fffb

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,13 @@ public SpotlessExtension(Project project) {
5959
rootApplyTask = project.task(EXTENSION + APPLY);
6060
rootApplyTask.setGroup(TASK_GROUP);
6161
rootApplyTask.setDescription(APPLY_DESCRIPTION);
62-
if (project.getRootProject() == project) {
63-
registerDependenciesTask = project.getTasks().create(RegisterDependenciesTask.TASK_NAME, RegisterDependenciesTask.class);
62+
63+
RegisterDependenciesTask registerDependenciesTask = (RegisterDependenciesTask) project.getRootProject().getTasks().findByName(RegisterDependenciesTask.TASK_NAME);
64+
if (registerDependenciesTask == null) {
65+
registerDependenciesTask = project.getRootProject().getTasks().create(RegisterDependenciesTask.TASK_NAME, RegisterDependenciesTask.class);
6466
registerDependenciesTask.setup();
65-
} else {
66-
registerDependenciesTask = project.getRootProject().getPlugins().apply(SpotlessPlugin.class).spotlessExtension.registerDependenciesTask;
6767
}
68+
this.registerDependenciesTask = registerDependenciesTask;
6869
}
6970

7071
/** Line endings (if any). */

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/MultiProjectAfterEvaluate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void failureDoesntTriggerAll() throws IOException {
3535
"}",
3636
"spotless { java { googleJavaFormat() } }");
3737
String output = gradleRunner6().withArguments("spotlessApply", "--warning-mode", "all").build().getOutput().replace("\r\n", "\n");
38-
Assertions.assertThat(output).contains("Using method Project#afterEvaluate(Action) when the project is already evaluated has been deprecated.");
38+
Assertions.assertThat(output).doesNotContain("Using method Project#afterEvaluate(Action) when the project is already evaluated has been deprecated.");
3939
}
4040

4141
private final GradleRunner gradleRunner6() throws IOException {

0 commit comments

Comments
 (0)