fix: resolve expandWildcardImports classpath from Java source sets - #3017
Merged
nedtwigg merged 1 commit intoAug 16, 2026
Merged
Conversation
expandWildcardImports() walked every resolvable Gradle configuration. Unrelated configs (generated output, custom resolvable configs) were resolved at configuration time and could fail the build. Use each Java source set's compile classpath instead. Fixes diffplug#2998
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes
Fixes #2998
Changes and Review
expandWildcardImports()resolved every Gradle configuration withcanBeResolved=truewhen building the JavaParser type-solver classpath. That included leftover or generated-code configurations that are not part of compilation and may not be resolvable yet.compileClasspath(plus the existing source directories).Test Plan
./gradlew :plugin-gradle:test --tests com.diffplug.gradle.spotless.JavaDefaultTargetTest.expandWildcardImportsIgnoresUnrelatedConfigurations— RED then GREEN./gradlew :plugin-gradle:test --tests com.diffplug.gradle.spotless.JavaDefaultTargetTest— 10/10 GREEN./gradlew :plugin-gradle:spotlessCheck— GREENPlease DO NOT FORCE PUSH. Don't worry about messy history.