From 6d318914d58b3780b67faf62e55f016f97bfa089 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Thu, 21 Sep 2023 16:49:12 +0100 Subject: [PATCH] Move Toolchain Config Outside Compile and Test tasks Issue gh-13811 --- build.gradle | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index d0b43286be..a725604001 100644 --- a/build.gradle +++ b/build.gradle @@ -131,25 +131,15 @@ def toolchainVersion() { } subprojects { - def toolchainVersion = toolchainVersion() + java { + toolchain { + languageVersion = JavaLanguageVersion.of(toolchainVersion()) + } + } tasks.withType(JavaCompile).configureEach { options.encoding = "UTF-8" options.compilerArgs.add("-parameters") - - java { - toolchain { - languageVersion = JavaLanguageVersion.of(toolchainVersion) - } - } - } - - tasks.withType(Test).configureEach { - java { - toolchain { - languageVersion = JavaLanguageVersion.of(toolchainVersion) - } - } } }