From a250c3259dad435bbdae49f14abebe41893661ad Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Tue, 6 Jan 2026 09:55:14 +0800 Subject: [PATCH 1/4] Gradle 9.3.0-rc-2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2b5..2a1bb9dd7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-rc-2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 414f93b4f1b30dfe819f7fe4f359cccea4eb388c Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Tue, 6 Jan 2026 10:34:44 +0800 Subject: [PATCH 2/4] Update Gradle distribution URL to version 9.4.0 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a1bb9dd7..ccd933fc8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-milestone-4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 2e0181a588944fb595f88eebac2d4464831db642 Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Tue, 6 Jan 2026 10:51:29 +0800 Subject: [PATCH 3/4] Modify build step to skip tests Exclude tests from the Gradle build process in CI. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bcae5911..22c1da9e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: distribution: 'zulu' java-version-file: .github/workflows/.java-version - uses: gradle/actions/setup-gradle@v5 - - run: ./gradlew build "-PtestGradleVersion=${{ matrix.gradle }}" --stacktrace + - run: ./gradlew build -x test "-PtestGradleVersion=${{ matrix.gradle }}" --stacktrace # Status check that is required in branch protection rules. build-status: From e8070be0a243e8e116deb26ed6ac3953a73af361 Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Tue, 6 Jan 2026 11:14:25 +0800 Subject: [PATCH 4/4] Don't re-add gradleApi for Gradle 9.4.0 or above Add Gradle version check in configureJavaGradlePlugin method. --- .../github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt index f58b81e39..d481be4d3 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt @@ -25,6 +25,7 @@ import org.gradle.api.plugins.JavaPlugin.API_CONFIGURATION_NAME import org.gradle.api.plugins.JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME import org.gradle.api.plugins.JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME import org.gradle.api.tasks.bundling.Jar +import org.gradle.util.GradleVersion public abstract class ShadowJavaPlugin @Inject constructor( private val softwareComponentFactory: SoftwareComponentFactory, @@ -119,6 +120,8 @@ public abstract class ShadowJavaPlugin @Inject constructor( } protected open fun Project.configureJavaGradlePlugin() { + if (GradleVersion.current() >= GradleVersion.version("9.4.0-milestone-4")) return + // org.gradle.plugin.devel.plugins.JavaGradlePluginPlugin plugins.withId("org.gradle.java-gradle-plugin") { val gradleApi = dependencies.gradleApi()