From 0b500f6940ac5caadaf6746934b787a1b1a3362e Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 26 Aug 2023 20:56:48 +0530
Subject: chore(build): require a Java 20 host

---
 build-logic/build.gradle.kts                                         | 5 +----
 .../src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt   | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'build-logic')

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 19fb1043..b5e2ed8f 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -5,10 +5,7 @@
 
 plugins { `kotlin-dsl` }
 
-private val jvmToolchainAction =
-  Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) }
-
-kotlin.jvmToolchain(jvmToolchainAction)
+kotlin.jvmToolchain(20)
 
 gradlePlugin {
   plugins {
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
index 68195033..14b8e716 100644
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
@@ -47,6 +47,6 @@ class KotlinCommonPlugin : Plugin<Project> {
       )
 
     val JVM_TOOLCHAIN_ACTION =
-      Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) }
+      Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(20)) }
   }
 }
-- 
cgit v1.2.3