From 37225689f9bb262f5d7f7c0729aef84580c0506e Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Thu, 27 Jun 2024 18:38:46 -0500 Subject: [PATCH 1/3] add toolchain to buildSrc --- buildSrc/build.gradle | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index d894aeec2..01ae0223f 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -41,4 +41,15 @@ dependencies { implementation group: 'commons-io', name: 'commons-io', version: '2.7' implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.0.5' +} + + +var props = Properties() +props.load(project.file("../gradle.properties").text) +var javaVersion = props.getProperty("java_version") as String + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(Integer.valueOf(javaVersion)) + } } \ No newline at end of file From 47bb97bf75885259c68bbd79bfb008fd9034096d Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Thu, 27 Jun 2024 18:40:52 -0500 Subject: [PATCH 2/3] fix ctor --- buildSrc/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 01ae0223f..e2cd66995 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -43,8 +43,7 @@ dependencies { implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.0.5' } - -var props = Properties() +var props = new java.util.Properties() props.load(project.file("../gradle.properties").text) var javaVersion = props.getProperty("java_version") as String From 71bec1eec607f01877d9b6c0915b398ca36815f9 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Thu, 27 Jun 2024 18:41:59 -0500 Subject: [PATCH 3/3] fix load --- buildSrc/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index e2cd66995..96f09f8bb 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -44,7 +44,9 @@ dependencies { } var props = new java.util.Properties() -props.load(project.file("../gradle.properties").text) +try (var stream = project.file("../gradle.properties").newInputStream()) { + props.load(stream) +} var javaVersion = props.getProperty("java_version") as String java {