diff --git a/buildSrc/src/main/kotlin/multiloader-common.gradle.kts b/buildSrc/src/main/kotlin/multiloader-common.gradle.kts index d42029f6..039ee7a1 100644 --- a/buildSrc/src/main/kotlin/multiloader-common.gradle.kts +++ b/buildSrc/src/main/kotlin/multiloader-common.gradle.kts @@ -11,7 +11,7 @@ base { } java { - toolchain.languageVersion = JavaLanguageVersion.of(25) + toolchain.languageVersion = JavaLanguageVersion.of(rootProject.prop("toolchain_java_version")!!) // withSourcesJar() // withJavadocJar() } diff --git a/forgelike/build-lexforge.gradle.kts b/forgelike/build-lexforge.gradle.kts index c2deb3dc..61cc906b 100644 --- a/forgelike/build-lexforge.gradle.kts +++ b/forgelike/build-lexforge.gradle.kts @@ -25,7 +25,8 @@ legacyForge { } tasks.withType().configureEach { - val javaExe = javaToolchains.launcherFor { this.languageVersion = JavaLanguageVersion.of(25) } + val java = rootProject.prop("toolchain_java_version")!! + val javaExe = javaToolchains.launcherFor { this.languageVersion = JavaLanguageVersion.of(java) } .map { launcher -> launcher.executablePath.asFile.absolutePath } javaExecutable = javaExe diff --git a/forgelike/build.gradle.kts b/forgelike/build.gradle.kts index 743e7c54..5228d8f1 100644 --- a/forgelike/build.gradle.kts +++ b/forgelike/build.gradle.kts @@ -1,6 +1,5 @@ import net.neoforged.nfrtgradle.CreateMinecraftArtifacts import net.neoforged.nfrtgradle.NeoFormRuntimeTask -import org.gradle.kotlin.dsl.withType plugins { id("multiloader-loader").apply(false) @@ -26,7 +25,8 @@ neoForge { } tasks.withType().configureEach { - val javaExe = javaToolchains.launcherFor { this.languageVersion = JavaLanguageVersion.of(25) } + val java = rootProject.prop("toolchain_java_version")!! + val javaExe = javaToolchains.launcherFor { this.languageVersion = JavaLanguageVersion.of(java) } .map { launcher -> launcher.executablePath.asFile.absolutePath } javaExecutable = javaExe diff --git a/gradle.properties b/gradle.properties index dd6dd931..388a430c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,7 @@ org.gradle.jvmargs=-Xmx4G # Build tool properties +toolchain_java_version=25 stonecutter_version=0.10-alpha.2 loom_version=1.17.+ mdg_version=2.0.140