summaryrefslogtreecommitdiff
path: root/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2022-11-13 12:28:04 +0000
committerFabian Mastenbroek <mail.fabianm@gmail.com>2022-11-13 17:42:01 +0000
commit83ad9c927952474f1adeb03bd67331288ed6d6d9 (patch)
treeb1a2626375e07e43d8c412c9adcc78f0f4130f5e /buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
parentfb2672afb2d8236d5291cd028196c99d8e4d47f1 (diff)
build: Make use of Gradle's Java Toolchains feature
This change updates the build configuration for Gradle to make use of its Java Toolchains feature which enables running/testing multiple Java versions at the same time. This feature can also provision a Java installation if it is not available on the user's system.
Diffstat (limited to 'buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts')
-rw-r--r--buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts9
1 files changed, 8 insertions, 1 deletions
diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
index 5ccc06a4..79afdf7c 100644
--- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
@@ -29,8 +29,15 @@ plugins {
}
/* Project configuration */
+
+kotlin {
+ jvmToolchain {
+ val javaVersion = project.defaultVersionCatalog.getVersion("java")
+ languageVersion.set(JavaLanguageVersion.of(javaVersion))
+ }
+}
+
tasks.withType<KotlinCompile>().configureEach {
- kotlinOptions.jvmTarget = Libs.jvmTarget.toString()
kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
kotlinOptions.freeCompilerArgs += "-Xjvm-default=all"
}