From 34cd214e58c4026ed4e3dd0a935616bcc147a01f Mon Sep 17 00:00:00 2001 From: Jan-Niclas Struewer <j.n.struewer@gmail.com> Date: Fri, 26 Jul 2024 17:02:56 +0200 Subject: [PATCH] build: - changed dependency imports inside the library to project(...) imports - replaced decaperated KotlinCompile task --- app/backend/build.gradle.kts | 16 ++++++++++------ kpi-calculator/adapter/build.gradle.kts | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/backend/build.gradle.kts b/app/backend/build.gradle.kts index 9061c718..b7dce5ae 100644 --- a/app/backend/build.gradle.kts +++ b/app/backend/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - val springVersion = "3.3.1" plugins { @@ -74,13 +72,19 @@ dependencies { testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutineVersion") } -tasks.withType<KotlinCompile> { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "21" +tasks.named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask::class.java) { + compilerOptions { + freeCompilerArgs.add("-Xjsr305=strict") } } +kotlin { + compilerOptions { + apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) + } +} + + tasks.withType<Test> { useJUnitPlatform() } diff --git a/kpi-calculator/adapter/build.gradle.kts b/kpi-calculator/adapter/build.gradle.kts index 5d6e8933..769403ad 100644 --- a/kpi-calculator/adapter/build.gradle.kts +++ b/kpi-calculator/adapter/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - implementation("de.fraunhofer.iem.kpiCalculator:model:0.0.2-SNAPSHOT") + implementation(project(":model")) testImplementation(kotlin("test")) } -- GitLab