Allow JDK >= 21 instead of requiring exactly JDK 21

  Replace jvmToolchain(21) with explicit jvmTarget and --release 21 compiler
  options so any JDK >= 21 can build the project while still producing
  Java 21-compatible bytecode. Update CI workflows from JDK 22 to JDK 25.

Author: michalharakal

.github/workflows/build.yml

@@ -18,11 +18,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 22
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 22
+          java-version: 25
 
       - name: Set up Node.js
         uses: actions/setup-node@v6

.github/workflows/documentation.yml

@@ -29,10 +29,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
 
-      - name: Set up JDK 22
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: '22'
+          java-version: '25'
           distribution: 'temurin'
 
       - name: Cache Gradle packages

.github/workflows/publish.yml

@@ -12,11 +12,11 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v6
-      - name: Set up JDK 22
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 22
+          java-version: 25
       - name: Validate signing configuration
         run: |
           if ! grep -Eq '^[[:space:]]*signAllPublications[[:space:]]*=[[:space:]]*true[[:space:]]*$' gradle.properties; then

.github/workflows/schema-validation.yml

@@ -17,10 +17,10 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v6
 
-    - name: Set up JDK 22
+    - name: Set up JDK 25
       uses: actions/setup-java@v5
       with:
-        java-version: '22'
+        java-version: '25'
         distribution: 'temurin'
 
     - name: Cache Gradle packages

build-logic/convention/build.gradle.kts

@@ -19,7 +19,13 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(21)
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set(21)
 }
 
 gradlePlugin {

build.gradle.kts

@@ -17,18 +17,38 @@ allprojects {
     group = "sk.ainet"
 }
 
-// Enforce a consistent JVM toolchain across all Kotlin modules to avoid bytecode mismatches
+// Require JDK 21+ but allow any newer version (produces Java 21 bytecode via --release / jvmTarget)
 subprojects {
-    // Kotlin Multiplatform projects
+    require(JavaVersion.current() >= JavaVersion.VERSION_21) {
+        "This project requires JDK 21+, but found ${JavaVersion.current()}"
+    }
+
+    // Kotlin Multiplatform projects – set jvmTarget on every JVM-like target
     plugins.withId("org.jetbrains.kotlin.multiplatform") {
         extensions.findByType(org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension::class.java)?.apply {
-            jvmToolchain(21)
+            targets.withType(org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget::class.java) {
+                compilerOptions {
+                    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
+                }
+            }
         }
     }
     // Kotlin/JVM projects
     plugins.withId("org.jetbrains.kotlin.jvm") {
         extensions.findByType(org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension::class.java)?.apply {
-            jvmToolchain(21)
+            compilerOptions {
+                jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
+            }
+        }
+    }
+
+    // Java sources – produce Java 21 bytecode regardless of the JDK used to compile.
+    // Skip Android projects: AGP manages source/target compatibility itself and rejects --release.
+    afterEvaluate {
+        if (!plugins.hasPlugin("com.android.library") && !plugins.hasPlugin("com.android.application")) {
+            tasks.withType<JavaCompile>().configureEach {
+                options.release.set(21)
+            }
         }
     }
 

kotlin-js-store/wasm/yarn.lock

@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+ws@8.18.0:
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
+  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==

skainet-apps/skainet-bert/build.gradle.kts

@@ -11,8 +11,6 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(21)
-
     androidTarget {
         publishLibraryVariants("release")
         @OptIn(ExperimentalKotlinGradlePluginApi::class)

skainet-apps/skainet-grayscale-cli/build.gradle.kts

@@ -4,10 +4,6 @@ plugins {
     application
 }
 
-kotlin {
-    jvmToolchain(21)
-}
-
 dependencies {
     implementation(kotlin("stdlib"))
     implementation(libs.kotlinx.cli)

skainet-apps/skainet-kgemma/build.gradle.kts

@@ -11,8 +11,6 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(21)
-
     androidTarget {
         publishLibraryVariants("release")
         @OptIn(ExperimentalKotlinGradlePluginApi::class)