Skip to content

[fix] Configuration cache for groovy #2797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nedtwigg merged 4 commits into from
Jan 21, 2026
+5 −3
Merged

[fix] Configuration cache for groovy #2797

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f1f63b
fix configuration cache for groovy
kroune Dec 30, 2025
6f5d933
CHANGES.md
kroune Dec 30, 2025
18c62f0
Merge branch 'main' into main-kroune
nedtwigg Jan 21, 2026
97a9511
spotlessApply 2026
nedtwigg Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions plugin-gradle/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
### Added
- Add the ability to specify a wildcard version (`*`) for external formatter executables. ([#2757](https://github.com/diffplug/spotless/issues/2757))
### Fixed
- configuration cache for groovy. ([#2797](https://github.com/diffplug/spotless/pull/2797))
- [fix] `NPE` due to workingTreeIterator being null for git ignored files. #911 ([#2771](https://github.com/diffplug/spotless/issues/2771))
### Changes
* Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
Expand Down
3 changes: 2 additions & 1 deletion plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,13 @@ protected void setupTask(SpotlessTask task) {
if (!getProject().getPlugins().hasPlugin(GroovyBasePlugin.class)) {
throw new GradleException(message);
}
final boolean excludeJavaValue = excludeJava;
Copy link
Member

@Goooler Goooler Jan 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be related, but needs to add a test for verifiing it.

Copy link
Contributor Author

@kroune kroune Jan 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was able to confirm locally that it fixes the issue, but wasn't able to write a working test (it just passed even though it failed in project). If it is really needed I will try to make it work a bit later

target = getSources(getProject(),
message,
sourceSet -> sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class),
file -> {
final String name = file.getName();
if (excludeJava) {
if (excludeJavaValue) {
return name.endsWith(".groovy");
} else {
return name.endsWith(".groovy") || name.endsWith(".java");
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ develocity {
termsOfUseUrl = "https://gradle.com/terms-of-service"
termsOfUseAgree = "yes"
publishing {
onlyIf { providers.environmentVariable('CI').present }
onlyIf { getenv('CI') != null }
Copy link
Member

@Goooler Goooler Jan 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is unrelated.

Copy link
Contributor Author

@kroune kroune Jan 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it just causes a warning for configuration cache. Nothing breaks, but I think code looks cleaner and it doesn't cause a warning

Copy link
Member

@Goooler Goooler Jan 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you paste the warning here?

}
}
}
Expand Down
Loading