diff --git a/.github/renovate.json5 b/.github/renovate.json5 index e63b89d9d..85130c7ad 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,14 +7,6 @@ 'dependencies', ], packageRules: [ - { - // https://github.com/tcurdt/jdependency/issues/325 - groupName: 'ASM and jdependency', - matchPackageNames: [ - 'org.vafer:jdependency', - 'org.ow2.asm:asm-commons', - ], - }, { groupName: 'Develocity', matchPackageNames: [ diff --git a/build.gradle.kts b/build.gradle.kts index d335434ad..df0931c57 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -115,7 +115,6 @@ dependencies { implementation(libs.apache.commonsCodec) implementation(libs.apache.commonsIo) implementation(libs.apache.log4j) - implementation(libs.asm) implementation(libs.jdependency) implementation(libs.jdom2) implementation(libs.kotlin.metadata) diff --git a/docs/changes/README.md b/docs/changes/README.md index 307925608..d101e695d 100644 --- a/docs/changes/README.md +++ b/docs/changes/README.md @@ -3,6 +3,10 @@ ## [Unreleased](https://github.com/GradleUp/shadow/compare/9.3.0...HEAD) - 2025-xx-xx +### Fixed + +- 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. ## [9.3.0](https://github.com/GradleUp/shadow/releases/tag/9.3.0) - 2025-12-05 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0ec4980a1..04d31c4a4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,8 +11,6 @@ apache-commonsCodec = "commons-codec:commons-codec:1.20.0" apache-commonsIo = "commons-io:commons-io:2.21.0" apache-log4j = "org.apache.logging.log4j:log4j-core:2.25.3" apache-maven-model = "org.apache.maven:maven-model:3.9.12" -asm = "org.ow2.asm:asm-commons:9.9.1" -# jdependency should be updated together with ASM, see https://github.com/tcurdt/jdependency/issues/325. jdependency = "org.vafer:jdependency:2.14" jdom2 = "org.jdom:jdom2:2.0.6.1" kotlin-metadata = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" } diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt index ac30aeb81..c10dddab5 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt @@ -4,8 +4,8 @@ import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator import com.github.jengelman.gradle.plugins.shadow.relocation.relocateClass import com.github.jengelman.gradle.plugins.shadow.relocation.relocatePath import java.util.regex.Pattern -import org.objectweb.asm.Opcodes -import org.objectweb.asm.commons.Remapper +import org.vafer.jdeb.shaded.objectweb.asm.Opcodes +import org.vafer.jdeb.shaded.objectweb.asm.commons.Remapper /** * Modified from diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt index f76439721..9b8c0c933 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt @@ -32,9 +32,9 @@ import org.gradle.api.internal.file.copy.FileCopyDetailsInternal import org.gradle.api.logging.Logging import org.gradle.api.tasks.WorkResult import org.gradle.api.tasks.WorkResults -import org.objectweb.asm.ClassReader -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.ClassWriter +import org.vafer.jdeb.shaded.objectweb.asm.commons.ClassRemapper /** * Modified from