From f569f4878659172471a5f511bdc3824b867b1654 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 02:44:49 +0000 Subject: [PATCH 1/4] Update dependency org.ow2.asm:asm-commons to v9.9 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0bc5a35b4..046f19bdf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ apache-ant = "org.apache.ant:ant:1.10.15" apache-commonsIo = "commons-io:commons-io:2.20.0" apache-log4j = "org.apache.logging.log4j:log4j-core:2.25.2" apache-maven-modelBuilder = "org.apache.maven:maven-model:3.9.11" -asm = "org.ow2.asm:asm-commons:9.8" +asm = "org.ow2.asm:asm-commons:9.9" # jdependency should be updated together with ASM, see https://github.com/tcurdt/jdependency/issues/325. jdependency = "org.vafer:jdependency:2.13" jdom2 = "org.jdom:jdom2:2.0.6.1" From 0841c817b43ea7d92c92f09e1f92901eaa07acca Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 6 Oct 2025 10:47:13 +0800 Subject: [PATCH 2/4] Fix ctor for `Remapper` --- .../gradle/plugins/shadow/internal/RelocatorRemapper.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 27645ce27..ccf2bd659 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,6 +4,7 @@ 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 /** @@ -15,7 +16,7 @@ import org.objectweb.asm.commons.Remapper internal class RelocatorRemapper( private val relocators: Set, private val onModified: () -> Unit = {}, -) : Remapper() { +) : Remapper(Opcodes.ASM9) { override fun mapValue(value: Any): Any { return if (value is String) { From b2eeef7d5f5f820a02153b16c925d4fe3179fc6e Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 9 Oct 2025 08:16:49 +0800 Subject: [PATCH 3/4] org.vafer:jdependency:2.14 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 046f19bdf..27152a79d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ apache-log4j = "org.apache.logging.log4j:log4j-core:2.25.2" apache-maven-modelBuilder = "org.apache.maven:maven-model:3.9.11" asm = "org.ow2.asm:asm-commons:9.9" # jdependency should be updated together with ASM, see https://github.com/tcurdt/jdependency/issues/325. -jdependency = "org.vafer:jdependency:2.13" +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" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } From ad2f242ce43e1274c4007794f260f1a687edf150 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 9 Oct 2025 08:19:10 +0800 Subject: [PATCH 4/4] Update changelog --- docs/changes/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changes/README.md b/docs/changes/README.md index 5cd36e305..769d3fcff 100644 --- a/docs/changes/README.md +++ b/docs/changes/README.md @@ -6,6 +6,7 @@ ### Changed - Change the group of `startShadowScripts` from `application` to `other`. ([#1797](https://github.com/GradleUp/shadow/pull/1797)) +- Update ASM and jdependency to support Java 26. ([#1799](https://github.com/GradleUp/shadow/pull/1799)) ## [9.2.2](https://github.com/GradleUp/shadow/compare/9.2.2) - 2025-09-26