diff --git a/build.gradle.kts b/build.gradle.kts index b1000ce..dc614c4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,6 +35,7 @@ val gsonVersion = providers.gradleProperty("gson_version") val commonsLang3Version = providers.gradleProperty("commons_lang3_version") val javaVersion = providers.gradleProperty("java_version") +val gradleJavaVersion = providers.gradleProperty("gradle_java_version") group = modGroup.get() base.archivesName = modName.get() @@ -118,6 +119,10 @@ tasks { targetCompatibility = javaVersion.get() if (javaVersion.get().toInt() > 8) options.release = javaVersion.get().toInt() } + named("updateDaemonJvm") { + languageVersion = JavaLanguageVersion.of(gradleJavaVersion.get().toInt()) + vendor = JvmVendorSpec.ADOPTIUM + } withType().configureEach { defaultCharacterEncoding = "UTF-8" } withType().configureEach { options.encoding = "UTF-8" } withType().configureEach { defaultCharacterEncoding = "UTF-8" } diff --git a/gradle.properties b/gradle.properties index 2c12702..2fce871 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,10 @@ bta_channel = release loader_version = 0.17.3-bta.8 # Check this on https://maven.thesignalumproject.net/#/infrastructure/fabric-loom/fabric-loom.gradle.plugin/ loom_version = 1.13.0-bta +# The Java version the JDK will be for compiling and running code. java_version = 8 +# The Java version the JDK will be for running Gradle. +gradle_java_version = 21 ########################################################################## # Mod Properties mod_version = 1.0.0 @@ -41,7 +44,7 @@ guava_version = 33.5.0-jre # Check this on https://central.sonatype.com/artifact/com.google.code.gson/gson/ gson_version = 2.13.2 # Check this on https://central.sonatype.com/artifact/org.apache.commons/commons-lang3/ -commons_lang3_version = 3.19.0 +commons_lang3_version = 3.20.0 # This should match the version used by the current BTA release. lwjgl_version = 3.3.3 ########################################################################## diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..e409a46 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,13 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect +toolchainVendor=ADOPTIUM +toolchainVersion=21 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f523375..8dcb8fb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ # Check this on https://gradle.org/releases/ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME