Merge pull request #23 from SinTh0r4s/ensure-exec-configurations-use-correct-java-launcher

buildscript: specify java version for all JavaExec tasks
This commit is contained in:
Johann Bernhardt authored and GitHub committed 2021-11-21 17:21:19 +01:00
commit 9bc3da4ff3
1 file changed
+20 -10
+20 -10
View File
@@ -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,