Skip to content

Revert "Make most transformers pattern-filterable (#2028)"#2078

Merged
Goooler merged 1 commit into
mainfrom
g/20260701/revert-for-patterns
Jul 2, 2026
Merged

Revert "Make most transformers pattern-filterable (#2028)"#2078
Goooler merged 1 commit into
mainfrom
g/20260701/revert-for-patterns

Conversation

@Goooler

@Goooler Goooler commented Jul 2, 2026

Copy link
Copy Markdown
Member

We don't have to expose so many PatternSets for these transformers for now.

Reverts #2028.


  • CHANGELOG's "Unreleased" section has been updated, if applicable.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR reverts the earlier change that made several built-in resource transformers pattern-filterable, removing the newly exposed PatternSet-based APIs and returning these transformers to fixed-path matching behavior.

Changes:

  • Revert multiple transformers from PatternFilterableResourceTransformer back to plain ResourceTransformer with explicit canTransformResource path checks.
  • Remove PatternSet-accepting constructors / overloads that were introduced for pattern filtering.
  • Update the unreleased changelog entry set and the generated public API surface (api/shadow.api) to reflect the revert.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestResourceTransformer.kt Reverts to manifest-only matching via MANIFEST_NAME and removes pattern-filterable constructor/API.
src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformer.kt Reverts to manifest-only matching and removes PatternSet-based filtering support.
src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformer.kt Reverts to fixed PLUGIN_CACHE_FILE path matching and drops pattern-filterable constructor.
src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformer.kt Reverts to matching only the two Groovy extension module descriptor paths, removing pattern filtering.
src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ComponentsXmlResourceTransformer.kt Reverts to fixed components.xml path matching and drops PatternSet constructor/API.
docs/changes/README.md Removes the unreleased changelog bullets that referred to exposing transformer patternSets.
api/shadow.api Updates the declared public API to remove PatternSet constructors and base-class inheritance from the reverted transformers.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

We don't have to expose so many `PatternSet`s for these transformers for now.

This reverts commit 4a7db87
@Goooler Goooler force-pushed the g/20260701/revert-for-patterns branch from 1e54567 to c8e2c3e Compare July 2, 2026 01:27
@Goooler Goooler enabled auto-merge (squash) July 2, 2026 01:27
@Goooler Goooler disabled auto-merge July 2, 2026 01:29
@Goooler Goooler enabled auto-merge (squash) July 2, 2026 01:30
@Goooler Goooler merged commit 405f5da into main Jul 2, 2026
8 checks passed
@Goooler Goooler deleted the g/20260701/revert-for-patterns branch July 2, 2026 01:41
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.

2 participants