From dae8d95d4e55f8de1548b197007ede542795c229 Mon Sep 17 00:00:00 2001
From: Siphalor <info@siphalor.de>
Date: Sun, 27 Jul 2025 22:31:12 +0200
Subject: [PATCH] [build] Fix and improve Java versions

---
 .../kotlin/de.siphalor.tweed5.base-module.gradle.kts  | 11 ++++++-----
 gradle/libs.versions.toml                             |  2 ++
 test-utils/build.gradle.kts                           |  5 +++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts b/buildSrc/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts
index 58222a7..1b878b5 100644
--- a/buildSrc/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts
+++ b/buildSrc/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts
@@ -11,8 +11,8 @@ group = rootProject.group
 version = rootProject.version
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.toVersion(libs.versions.java.main.get())
+    targetCompatibility = JavaVersion.toVersion(libs.versions.java.main.get())
 }
 
 repositories {
@@ -42,7 +42,8 @@ dependencies {
 
     implementation(libs.acl)
     "localRuntimeOnly"(libs.slf4j.rt)
-    testRuntimeOnly(libs.slf4j.rt)
+	testImplementation(libs.acl)
+    testImplementation(libs.slf4j.rt)
 
     testImplementation(platform(libs.junit.platform))
     testImplementation(libs.junit.core)
@@ -54,8 +55,8 @@ dependencies {
 }
 
 tasks.compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_21.toString()
-    targetCompatibility = JavaVersion.VERSION_21.toString()
+    sourceCompatibility = libs.versions.java.test.get()
+    targetCompatibility = libs.versions.java.test.get()
 }
 
 tasks.test {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8a6e908..cc471cd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,6 +3,8 @@ assertj = "3.26.3"
 asm = "9.7"
 autoservice = "1.1.1"
 acl = "1.3.5"
+java-main = "8"
+java-test = "21"
 jetbrains-annotations = "26.0.1"
 jspecify = "1.0.0"
 junit = "5.12.0"
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 401a1f9..f3ba020 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -1,3 +1,8 @@
 plugins {
 	java
 }
+
+java {
+	sourceCompatibility = JavaVersion.toVersion(libs.versions.java.test.get())
+	targetCompatibility = JavaVersion.toVersion(libs.versions.java.test.get())
+}