Skip to content

fix: resolve expandWildcardImports classpath from Java source sets - #3017

Merged
nedtwigg merged 1 commit into
diffplug:mainfrom
kalayciburak:fix-expand-wildcard-imports-classpath
Aug 16, 2026
Merged

fix: resolve expandWildcardImports classpath from Java source sets#3017
nedtwigg merged 1 commit into
diffplug:mainfrom
kalayciburak:fix-expand-wildcard-imports-classpath

Conversation

@kalayciburak

Copy link
Copy Markdown
Contributor

Fixes

Fixes #2998

Changes and Review

expandWildcardImports() resolved every Gradle configuration with canBeResolved=true when 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.

  • Collect type-solver jars from each Java source set's compileClasspath (plus the existing source directories).
  • Leave unrelated resolvable configurations alone.

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 — GREEN

Please DO NOT FORCE PUSH. Don't worry about messy history.

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
@nedtwigg
nedtwigg merged commit 0b26be9 into diffplug:main Aug 16, 2026
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ExpandWildcardImports incorrectly references dependencies from all configurations

2 participants