Skip to content

Commit 2bddd96

Browse files
GooolerCopilot
andauthored
Use ASM from jdependency embedded (#1898)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 42fb7fe commit 2bddd96

File tree

6 files changed

+9
-16
lines changed

6 files changed

+9
-16
lines changed

.github/renovate.json5

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
'dependencies',
88
],
99
packageRules: [
10-
{
11-
// https://github.com/tcurdt/jdependency/issues/325
12-
groupName: 'ASM and jdependency',
13-
matchPackageNames: [
14-
'org.vafer:jdependency',
15-
'org.ow2.asm:asm-commons',
16-
],
17-
},
1810
{
1911
groupName: 'Develocity',
2012
matchPackageNames: [

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ dependencies {
115115
implementation(libs.apache.commonsCodec)
116116
implementation(libs.apache.commonsIo)
117117
implementation(libs.apache.log4j)
118-
implementation(libs.asm)
119118
implementation(libs.jdependency)
120119
implementation(libs.jdom2)
121120
implementation(libs.kotlin.metadata)

docs/changes/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
## [Unreleased](https://github.com/GradleUp/shadow/compare/9.3.0...HEAD) - 2025-xx-xx
55

6+
### Fixed
7+
8+
- Use ASM from jdependency embedded. ([#1898](https://github.com/GradleUp/shadow/pull/1898))
9+
This fixes potential classpath conflicts when using Shadow with other plugins that also use ASM.
610

711
## [9.3.0](https://github.com/GradleUp/shadow/releases/tag/9.3.0) - 2025-12-05
812

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ apache-commonsCodec = "commons-codec:commons-codec:1.20.0"
1111
apache-commonsIo = "commons-io:commons-io:2.21.0"
1212
apache-log4j = "org.apache.logging.log4j:log4j-core:2.25.3"
1313
apache-maven-model = "org.apache.maven:maven-model:3.9.12"
14-
asm = "org.ow2.asm:asm-commons:9.9.1"
15-
# jdependency should be updated together with ASM, see https://github.com/tcurdt/jdependency/issues/325.
1614
jdependency = "org.vafer:jdependency:2.14"
1715
jdom2 = "org.jdom:jdom2:2.0.6.1"
1816
kotlin-metadata = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" }

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
44
import com.github.jengelman.gradle.plugins.shadow.relocation.relocateClass
55
import com.github.jengelman.gradle.plugins.shadow.relocation.relocatePath
66
import java.util.regex.Pattern
7-
import org.objectweb.asm.Opcodes
8-
import org.objectweb.asm.commons.Remapper
7+
import org.vafer.jdeb.shaded.objectweb.asm.Opcodes
8+
import org.vafer.jdeb.shaded.objectweb.asm.commons.Remapper
99

1010
/**
1111
* Modified from

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ import org.gradle.api.internal.file.copy.FileCopyDetailsInternal
3232
import org.gradle.api.logging.Logging
3333
import org.gradle.api.tasks.WorkResult
3434
import org.gradle.api.tasks.WorkResults
35-
import org.objectweb.asm.ClassReader
36-
import org.objectweb.asm.ClassWriter
37-
import org.objectweb.asm.commons.ClassRemapper
35+
import org.vafer.jdeb.shaded.objectweb.asm.ClassReader
36+
import org.vafer.jdeb.shaded.objectweb.asm.ClassWriter
37+
import org.vafer.jdeb.shaded.objectweb.asm.commons.ClassRemapper
3838

3939
/**
4040
* Modified from

0 commit comments

Comments
 (0)