From 06b211ac74abe53f3191c5cd7b4e012754b9399d Mon Sep 17 00:00:00 2001 From: Goooler Date: Fri, 10 Oct 2025 14:21:17 +0800 Subject: [PATCH 1/2] Update ASM and jdependency to support Java 26 (#1799) Syncs fc6ddff059cba246b081d150640fec4a43a83fa2. --- build.gradle.kts | 4 ++-- src/docs/changes/README.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 78c5de90f..b9a1e402c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,12 +74,12 @@ publishing.publications.withType().configureEach { dependencies { api("org.apache.ant:ant:1.10.15") // Types from Ant are exposed in the public API. implementation("org.jdom:jdom2:2.0.6.1") - implementation("org.ow2.asm:asm-commons:9.8") + implementation("org.ow2.asm:asm-commons:9.9") implementation("commons-io:commons-io:2.19.0") implementation("org.codehaus.plexus:plexus-utils:4.0.2") implementation("org.codehaus.plexus:plexus-xml:4.1.0") implementation("org.apache.logging.log4j:log4j-core:2.24.1") - implementation("org.vafer:jdependency:2.13") + implementation("org.vafer:jdependency:2.14") testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") { exclude(group = "org.codehaus.groovy") diff --git a/src/docs/changes/README.md b/src/docs/changes/README.md index cfba8f9bd..8131a2857 100644 --- a/src/docs/changes/README.md +++ b/src/docs/changes/README.md @@ -6,6 +6,7 @@ **Changed** - Stop using start script templates bundled in Shadow. ([#1750](https://github.com/GradleUp/shadow/pull/1750)) +- Update ASM and jdependency to support Java 26. ([#1799](https://github.com/GradleUp/shadow/pull/1799)) **Fixed** From 0635691e77b007a647336e510963b5990cbeafa5 Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Fri, 10 Oct 2025 14:24:08 +0800 Subject: [PATCH 2/2] Apply suggestion from @Goooler --- src/docs/changes/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/changes/README.md b/src/docs/changes/README.md index 8131a2857..13bf6fe6d 100644 --- a/src/docs/changes/README.md +++ b/src/docs/changes/README.md @@ -6,7 +6,7 @@ **Changed** - Stop using start script templates bundled in Shadow. ([#1750](https://github.com/GradleUp/shadow/pull/1750)) -- Update ASM and jdependency to support Java 26. ([#1799](https://github.com/GradleUp/shadow/pull/1799)) +- Update ASM and jdependency to support Java 26. ([#1810](https://github.com/GradleUp/shadow/pull/1810)) **Fixed**