From a4525f9b16d29cfb1db9570abbef4147bec7d71c Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Mon, 15 Sep 2025 07:19:20 +0200
Subject: [PATCH] Use jvmTarget, kotlinLanguage and kotlinApi from
 libs.versions.toml

---
 build.gradle.kts                                     |  1 -
 .../main/kotlin/conventions/kotlin-jvm.gradle.kts    | 12 +++++++-----
 gradle/libs.versions.toml                            | 11 ++++++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 26f440e..ff6ad50 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
     implementation(openrndr.ffmpeg)
     implementation(orx.bundles.basic)
     implementation(orx.olive)
-
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.kotlinx.serialization.core)
     implementation(libs.kotlinx.serialization.json)
diff --git a/buildSrc/src/main/kotlin/conventions/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/conventions/kotlin-jvm.gradle.kts
index cbfb369..657c25e 100644
--- a/buildSrc/src/main/kotlin/conventions/kotlin-jvm.gradle.kts
+++ b/buildSrc/src/main/kotlin/conventions/kotlin-jvm.gradle.kts
@@ -3,6 +3,8 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
+val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
 plugins {
     java
     kotlin("jvm")
@@ -15,15 +17,15 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.valueOf("VERSION_${libs.findVersion("jvmTarget").get().displayName}")
+    sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.findVersion("jvmTarget").get().displayName}")
 }
 
 kotlin {
     compilerOptions {
-        languageVersion = KotlinVersion.KOTLIN_2_0
-        apiVersion = KotlinVersion.KOTLIN_2_0
-        jvmTarget = JvmTarget.JVM_17
+        apiVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.findVersion("kotlinApi").get().displayName.replace(".", "_")}"))
+        languageVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.findVersion("kotlinLanguage").get().displayName.replace(".", "_")}"))
+        jvmTarget.set(JvmTarget.valueOf("JVM_${libs.findVersion("jvmTarget").get().displayName}"))
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8418512..02e4840 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,9 +1,14 @@
 [versions]
+jvmTarget = "17"
 kotlin = "2.2.10"
+kotlinApi = "2.2"
+kotlinLanguage = "2.2"
+
 openrndr = "0.5.0-SNAPSHOT"
 orx = "0.5.0-SNAPSHOT"
 orsl = "0.4.5-alpha5"
 orml = "0.4.1"
+
 slf4j = "2.0.17"
 log4j = "2.23.1"
 jackson = "2.17.2"
@@ -28,9 +33,9 @@ log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.
 jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
 jackson-json = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" }
 
-shadow-gradle-plugin = { group = "com.gradleup.shadow", name = "com.gradleup.shadow.gradle.plugin", version.ref = "shadow"}
-runtime-gradle-plugin = { group = "org.beryx.runtime", name = "org.beryx.runtime.gradle.plugin", version.ref = "runtime"}
-kotlin-gradle-plugin = { group = "org.jetbrains.kotlin.jvm", name = "org.jetbrains.kotlin.jvm.gradle.plugin", version.ref = "kotlin"}
+shadow-gradle-plugin = { group = "com.gradleup.shadow", name = "com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }
+runtime-gradle-plugin = { group = "org.beryx.runtime", name = "org.beryx.runtime.gradle.plugin", version.ref = "runtime" }
+kotlin-gradle-plugin = { group = "org.jetbrains.kotlin.jvm", name = "org.jetbrains.kotlin.jvm.gradle.plugin", version.ref = "kotlin" }
 xversions-gradle-plugin = { group = "com.github.ben-manes.versions", name = "com.github.ben-manes.versions.gradle.plugin", version.ref = "versions" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }