Fix the regression of can't shadow directory inputs #1613
Merged
Conversation
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
Goooler
changed the title
Goooler
force-pushed
the
g/20250808/cant-use-dirs
branch
from
592a8b1 to
d114594
Compare
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a regression where the shadow plugin couldn't handle directory inputs for shadowing. The fix modifies the ShadowJar task to properly handle directory inputs by checking if a file is a directory before attempting to process it as an archive.
- Restructured the file processing logic in
ShadowJar.copy()to handle directories, AAR files, and regular archives separately - Added comprehensive test coverage for custom source set output shadowing
- Updated changelog to document the fix
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt |
Modified file processing logic to handle directory inputs properly |
src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginsTest.kt |
Added test case for shadowing custom source set output with directories |
docs/changes/README.md |
Added changelog entry for the regression fix |
src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt
Show resolved
Hide resolved
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.
Closes #1606.