Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions docs/changes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down