Skip to content

Commit 748ef41

Browse files
committed
Fix test failures.
1 parent c45e1f2 commit 748ef41

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public abstract class SpotlessTaskImpl extends SpotlessTask {
4848

4949
void init(Provider<SpotlessTaskService> service) {
5050
taskServiceProvider = service;
51-
usesService(service);
51+
SpotlessTaskService.usesServiceTolerateTestFailure(this, service);
5252
getTaskService().set(service);
5353
getProjectDir().set(getProject().getProjectDir());
5454
}

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2022 DiffPlug
2+
* Copyright 2021-2023 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
2727
import org.gradle.api.file.DirectoryProperty;
2828
import org.gradle.api.model.ObjectFactory;
2929
import org.gradle.api.provider.Property;
30+
import org.gradle.api.provider.Provider;
3031
import org.gradle.api.services.BuildService;
3132
import org.gradle.api.services.BuildServiceParameters;
3233
import org.gradle.api.tasks.Internal;
@@ -91,6 +92,16 @@ public void close() throws Exception {
9192

9293
static String INDEPENDENT_HELPER = "Helper";
9394

95+
static void usesServiceTolerateTestFailure(DefaultTask task, Provider<SpotlessTaskService> serviceProvider) {
96+
try {
97+
task.usesService(serviceProvider);
98+
} catch (ClassCastException e) {
99+
// this happens only in our test mocking, e.g. DiffMessageFormatterTest
100+
// https://github.com/diffplug/spotless/pull/1570/commits/c45e1f2322c78f272689feb35753bbc633422bfa
101+
// it's fine to swallow these exceptions
102+
}
103+
}
104+
94105
static abstract class ClientTask extends DefaultTask {
95106
@Internal
96107
abstract Property<File> getSpotlessOutDirectory();
@@ -105,7 +116,7 @@ static abstract class ClientTask extends DefaultTask {
105116
protected abstract ObjectFactory getConfigCacheWorkaround();
106117

107118
void init(SpotlessTaskImpl impl) {
108-
usesService(impl.getTaskServiceProvider());
119+
usesServiceTolerateTestFailure(this, impl.getTaskServiceProvider());
109120
getSpotlessOutDirectory().set(impl.getOutputDirectory());
110121
getTaskService().set(impl.getTaskService());
111122
getProjectDir().set(impl.getProjectDir());

0 commit comments

Comments
 (0)