From 8ce9107d4077de25c51869c0f9a8a81537fa88d8 Mon Sep 17 00:00:00 2001
From: Jan-Niclas Struewer <j.n.struewer@gmail.com>
Date: Wed, 31 Jul 2024 11:51:05 +0200
Subject: [PATCH] build: defined a common jvmToolchain version (21)
---
app/backend/build.gradle.kts | 10 +++-------
kpi-calculator/adapter/build.gradle.kts | 6 +++++-
kpi-calculator/core/build.gradle.kts | 6 +++++-
kpi-calculator/model/build.gradle.kts | 8 ++++++--
4 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/app/backend/build.gradle.kts b/app/backend/build.gradle.kts
index 233b3c43..8c4a90f9 100644
--- a/app/backend/build.gradle.kts
+++ b/app/backend/build.gradle.kts
@@ -21,7 +21,7 @@ allOpen {
group = "de.fraunhofer.iem"
version = "0.0.2-SNAPSHOT"
-java.sourceCompatibility = JavaVersion.VERSION_21
+
configurations {
compileOnly {
extendsFrom(configurations.annotationProcessor.get())
@@ -56,15 +56,11 @@ dependencies {
testRuntimeOnly(libs.h2db)
}
-tasks.named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask::class.java) {
- compilerOptions {
- freeCompilerArgs.add("-Xjsr305=strict")
- }
-}
-
kotlin {
compilerOptions {
+ jvmToolchain(21)
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+ freeCompilerArgs.add("-Xjsr305=strict")
}
}
diff --git a/kpi-calculator/adapter/build.gradle.kts b/kpi-calculator/adapter/build.gradle.kts
index aa309758..ec2ec29b 100644
--- a/kpi-calculator/adapter/build.gradle.kts
+++ b/kpi-calculator/adapter/build.gradle.kts
@@ -17,6 +17,10 @@ dependencies {
tasks.test {
useJUnitPlatform()
}
+
kotlin {
- jvmToolchain(21)
+ compilerOptions {
+ jvmToolchain(21)
+ apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+ }
}
diff --git a/kpi-calculator/core/build.gradle.kts b/kpi-calculator/core/build.gradle.kts
index f18ba4f7..a8f19e03 100644
--- a/kpi-calculator/core/build.gradle.kts
+++ b/kpi-calculator/core/build.gradle.kts
@@ -16,6 +16,10 @@ dependencies {
tasks.test {
useJUnitPlatform()
}
+
kotlin {
- jvmToolchain(21)
+ compilerOptions {
+ jvmToolchain(21)
+ apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+ }
}
diff --git a/kpi-calculator/model/build.gradle.kts b/kpi-calculator/model/build.gradle.kts
index f18ba4f7..c8359655 100644
--- a/kpi-calculator/model/build.gradle.kts
+++ b/kpi-calculator/model/build.gradle.kts
@@ -16,6 +16,10 @@ dependencies {
tasks.test {
useJUnitPlatform()
}
+
kotlin {
- jvmToolchain(21)
-}
+ compilerOptions {
+ jvmToolchain(21)
+ apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+ }
+}
\ No newline at end of file
--
GitLab