From: AsamK <asamk@gmx.de>
Date: Sat, 22 Apr 2023 17:19:00 +0000 (+0200)
Subject: Fix build with java 20
X-Git-Tag: v0.11.9.1~1
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/3a4ad96a0004c8cc3871a0a666aafc3f98e9f5c0?ds=inline

Fix build with java 20

- previous fix required a jdk 17 to be installed as well
---

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 101c307f..3e8942b9 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,11 +1,17 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+
 plugins {
     `kotlin-dsl`
 }
 
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of("17"))
-    }
+tasks.named<KotlinCompilationTask<KotlinJvmCompilerOptions>>("compileKotlin").configure {
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+}
+
+java {
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 repositories {