From 49ca423c64d71b5292157a2039e0dc278a7691e6 Mon Sep 17 00:00:00 2001 From: Telan <13066272+TheElan@users.noreply.github.com> Date: Sun, 21 Nov 2021 17:14:58 +0200 Subject: [PATCH] buildscript: specify java version for all JavaExec tasks --- build.gradle | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 5a906de..a716f3f 100644 --- a/build.gradle +++ b/build.gradle @@ -45,9 +45,11 @@ apply plugin: 'scala' apply plugin: 'forge' apply plugin: 'idea' +def projectJavaVersion = JavaLanguageVersion.of(8) + java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(projectJavaVersion) } } @@ -351,7 +353,7 @@ runClient { runServer { def arguments = [] - if(usesMixins.toBoolean()) { + if (usesMixins.toBoolean()) { arguments += [ "--mods=../build/libs/$modId-${version}.jar", "--tweakClass org.spongepowered.asm.launch.MixinTweaker" @@ -361,15 +363,23 @@ runServer { args(arguments) } -processResources -{ - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version +tasks.withType(JavaExec).configureEach { + javaLauncher.set( + javaToolchains.launcherFor { + languageVersion = projectJavaVersion + } + ) +} - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' +processResources + { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' // replace version and mcversion expand "minecraftVersion": project.minecraft.version,