aboutsummaryrefslogtreecommitdiff
path: root/build-logic
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2023-08-26 20:56:48 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2023-08-26 20:57:12 +0530
commit0b500f6940ac5caadaf6746934b787a1b1a3362e (patch)
treea0eab3eb6060d8f9649e9d3b676724826086444c /build-logic
parent4c5659b04d7907efdaee0f47813f43f6b88ec5e3 (diff)
chore(build): require a Java 20 host
Diffstat (limited to 'build-logic')
-rw-r--r--build-logic/build.gradle.kts5
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt2
2 files changed, 2 insertions, 5 deletions
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)) }
}
}