From 9e05b88cd54ced4d27dcd95d2cb11eb77249475a Mon Sep 17 00:00:00 2001 From: ZZZank <47418975+ZZZank@users.noreply.github.com> Date: Mon, 22 Jun 2026 23:41:12 +0800 Subject: [PATCH] update buildscript to support building on Java 25 --- build.gradle | 8 +++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 8 +++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 6f2ba38..33f6212 100644 --- a/build.gradle +++ b/build.gradle @@ -23,12 +23,12 @@ plugins { id 'eclipse' id 'maven-publish' id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7' - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.21' + id 'com.gtnewhorizons.retrofuturagradle' version '2.0.2' id 'net.darkhax.curseforgegradle' version '1.0.14' apply false id 'com.modrinth.minotaur' version '2.8.0' apply false id 'com.diffplug.spotless' version '6.13.0' apply false id 'com.palantir.git-version' version '3.0.0' apply false - id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id 'com.gradleup.shadow' version '9.4.2' apply false } if (verifySettingsGradle()) { @@ -277,7 +277,9 @@ else { } group = modGroup -archivesBaseName = modArchivesBaseName +base { + archivesName = modArchivesBaseName +} minecraft { mcVersion = minecraftVersion diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17a8ddc..cf71939 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.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 9d2bae4..7b69294 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,9 +3,7 @@ pluginManagement { maven { // RetroFuturaGradle name 'GTNH Maven' - //noinspection HttpUrlsUsage - url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/' - allowInsecureProtocol = true + url 'https://nexus.gtnewhorizons.com/repository/public/' //noinspection GroovyAssignabilityCheck mavenContent { includeGroup 'com.gtnewhorizons' @@ -19,9 +17,9 @@ pluginManagement { } plugins { - id 'com.diffplug.blowdryerSetup' version '1.6.0' + id 'com.diffplug.blowdryerSetup' version '1.7.1' // Automatic toolchain provisioning - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' } blowdryerSetup {