File tree Expand file tree Collapse file tree 6 files changed +9
-16
lines changed
src/main/kotlin/com/github/jengelman/gradle/plugins/shadow Expand file tree Collapse file tree 6 files changed +9
-16
lines changed Original file line number Diff line number Diff line change 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 : [
Original file line number Diff line number Diff 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)
Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change @@ -11,8 +11,6 @@ apache-commonsCodec = "commons-codec:commons-codec:1.20.0"
1111apache-commonsIo = " commons-io:commons-io:2.21.0"
1212apache-log4j = " org.apache.logging.log4j:log4j-core:2.25.3"
1313apache-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.
1614jdependency = " org.vafer:jdependency:2.14"
1715jdom2 = " org.jdom:jdom2:2.0.6.1"
1816kotlin-metadata = { module = " org.jetbrains.kotlin:kotlin-metadata-jvm" , version.ref = " kotlin" }
Original file line number Diff line number Diff line change @@ -4,8 +4,8 @@ import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
44import com.github.jengelman.gradle.plugins.shadow.relocation.relocateClass
55import com.github.jengelman.gradle.plugins.shadow.relocation.relocatePath
66import 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
Original file line number Diff line number Diff line change @@ -32,9 +32,9 @@ import org.gradle.api.internal.file.copy.FileCopyDetailsInternal
3232import org.gradle.api.logging.Logging
3333import org.gradle.api.tasks.WorkResult
3434import 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
You can’t perform that action at this time.
0 commit comments