From 4aef0354dda7d89c7d7e7632564d1a5bf75d3f1f Mon Sep 17 00:00:00 2001 From: Jason <11360596+jpenilla@users.noreply.github.com> Date: Wed, 7 Jul 2021 06:18:02 -0700 Subject: [PATCH] [ci skip] Use Java toolchain for run tasks (#6108) --- patches/server/0001-Setup-Gradle-project.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 6d7bcc9c4b..409c87b8e1 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -20,10 +20,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a /.project diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..e9db6b3bad237c0b3fdb14e96b6f0f29ba8ee312 +index 0000000000000000000000000000000000000000..be565d252e326991f491cab3bfd3acc8356bbc7f --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,135 @@ +@@ -0,0 +1,138 @@ +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer +import io.papermc.paperweight.util.Git @@ -135,6 +135,9 @@ index 0000000000000000000000000000000000000000..e9db6b3bad237c0b3fdb14e96b6f0f29 + doFirst { + workingDir.mkdirs() + } ++ javaLauncher.set(project.javaToolchains.launcherFor { ++ languageVersion.set(JavaLanguageVersion.of(project.tasks.compileJava.get().options.release.get())) ++ }) + block(this) +} +