From b45f68feddca6b551b606919c20a593f91f2d549 Mon Sep 17 00:00:00 2001 From: vlofgren Date: Sat, 21 May 2022 15:14:47 +0200 Subject: [PATCH] Fix build problems on jdk-18 machines --- build.gradle | 1 - marginalia_nu/build.gradle | 6 ++++++ third_party/build.gradle | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b25c2872..cb2fef4b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ plugins { group 'nu.marginalia' version 'SNAPSHOT' - compileJava.options.encoding = "UTF-8" compileTestJava.options.encoding = "UTF-8" repositories { diff --git a/marginalia_nu/build.gradle b/marginalia_nu/build.gradle index dd6e06eb..522d81b6 100644 --- a/marginalia_nu/build.gradle +++ b/marginalia_nu/build.gradle @@ -24,6 +24,12 @@ repositories { } } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation project(':third_party') diff --git a/third_party/build.gradle b/third_party/build.gradle index 2ff91d9f..cc0cb57d 100644 --- a/third_party/build.gradle +++ b/third_party/build.gradle @@ -21,6 +21,12 @@ repositories { } } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation 'junit:junit:4.13.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' @@ -108,4 +114,4 @@ dependencies { test { useJUnitPlatform() -} \ No newline at end of file +}