From 880c0d430325e1021ec0eb290ddd6c24cb5645f4 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 26 Feb 2026 14:07:16 +0800 Subject: [PATCH] Use ASM from jdependency embedded --- build.gradle.kts | 1 - src/docs/changes/README.md | 2 ++ .../gradle/plugins/shadow/impl/RelocatorRemapper.groovy | 2 +- .../gradle/plugins/shadow/tasks/ShadowCopyAction.groovy | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 95314587c..4408dd8b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,7 +74,6 @@ publishing.publications.withType().configureEach { dependencies { api("org.apache.ant:ant:1.10.15") // Types from Ant are exposed in the public API. implementation("org.jdom:jdom2:2.0.6.1") - implementation("org.ow2.asm:asm-commons:9.9") implementation("commons-io:commons-io:2.19.0") implementation("org.codehaus.plexus:plexus-utils:4.0.2") implementation("org.codehaus.plexus:plexus-xml:4.1.1") diff --git a/src/docs/changes/README.md b/src/docs/changes/README.md index 13bf6fe6d..23fc514f7 100644 --- a/src/docs/changes/README.md +++ b/src/docs/changes/README.md @@ -11,6 +11,8 @@ **Fixed** - Fix resolving BOM dependencies when `minimize` is enabled. ([#1638](https://github.com/GradleUp/shadow/pull/1638)) +- Use ASM from jdependency embedded. ([#1898](https://github.com/GradleUp/shadow/pull/1898)) + This fixes potential classpath conflicts when using Shadow with other plugins that also use ASM. ## [v8.3.9] (2025-08-05) diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/impl/RelocatorRemapper.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/impl/RelocatorRemapper.groovy index 31fafab21..f47ecf104 100644 --- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/impl/RelocatorRemapper.groovy +++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/impl/RelocatorRemapper.groovy @@ -25,7 +25,7 @@ import com.github.jengelman.gradle.plugins.shadow.relocation.RelocatePathContext import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowCopyAction.RelativeArchivePath import groovy.transform.CompileStatic -import org.objectweb.asm.commons.Remapper +import org.vafer.jdeb.shaded.objectweb.asm.commons.Remapper import java.util.regex.Matcher import java.util.regex.Pattern diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.groovy index 3fb9eaef4..90ade6def 100644 --- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.groovy +++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.groovy @@ -34,10 +34,10 @@ import org.gradle.api.tasks.WorkResults import org.gradle.api.tasks.bundling.Zip import org.gradle.api.tasks.util.PatternSet import org.gradle.internal.UncheckedException -import org.objectweb.asm.ClassReader -import org.objectweb.asm.ClassVisitor -import org.objectweb.asm.ClassWriter -import org.objectweb.asm.commons.ClassRemapper +import org.vafer.jdeb.shaded.objectweb.asm.ClassReader +import org.vafer.jdeb.shaded.objectweb.asm.ClassVisitor +import org.vafer.jdeb.shaded.objectweb.asm.ClassWriter +import org.vafer.jdeb.shaded.objectweb.asm.commons.ClassRemapper import java.util.zip.ZipException