From 4948a8955bfdae85eed86b11e247ee0d45ad53a4 Mon Sep 17 00:00:00 2001 From: layue13 Date: Sat, 5 Sep 2026 20:44:33 +0000 Subject: [PATCH] =?UTF-8?q?build(slashblade-kamuy):=20Daemon=20JVM=20crite?= =?UTF-8?q?ria=20=E9=92=89=20JDK=2025?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题: 构建进程 JVM 依赖各机器 JAVA_HOME, 换环境漂移 改动: updateDaemonJvm --jvm-version=25 生成 gradle-daemon-jvm.properties(criteria 优先于 JAVA_HOME/org.gradle.java.home) [wrapper 升 9.4.0] 验证: JAVA_HOME=Zulu8 下 assemble 全绿(daemon 实跑 JDK25); 产物全部 major=52 --- gradle/gradle-daemon-jvm.properties | 12 ++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gradle/gradle-daemon-jvm.properties diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..1924b05 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,12 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect +toolchainVersion=25 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..dbc3ce4 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-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index e12f421..4c37312 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,5 +15,6 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.51' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24' }