From d7224af156aa5df19ac9466ad05bf52de8d5c638 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Fri, 27 Jun 2025 07:28:11 +0200 Subject: [PATCH] Separate language and api version settings --- .../kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts | 2 +- .../openrndr/extra/convention/kotlin-multiplatform.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts index 3fde7b28..ecdcbe4d 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts @@ -80,7 +80,7 @@ tasks { freeCompilerArgs.add("-Xexpect-actual-classes") freeCompilerArgs.add("-Xjdk-release=${libs.versions.jvmTarget.get()}") apiVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.versions.kotlinApi.get().replace(".", "_")}")) - languageVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.versions.kotlinApi.get().replace(".", "_")}")) + languageVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.versions.kotlinLanguage.get().replace(".", "_")}")) } } } diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts index 74f4e7a9..38156852 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts @@ -35,7 +35,7 @@ group = "org.openrndr.extra" tasks.withType> { compilerOptions { apiVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.versions.kotlinApi.get().replace(".", "_")}")) - languageVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.versions.kotlinApi.get().replace(".", "_")}")) + languageVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.versions.kotlinLanguage.get().replace(".", "_")}")) freeCompilerArgs.add("-Xexpect-actual-classes") } }