chore: use JDK 22 for building (#2075)

Part of
#1699.

24 is the newest one, but detekt supports up to 22.

Author: krzema12

.github/workflows/build.main.kts

@@ -14,7 +14,6 @@
 
 import io.github.typesafegithub.workflows.actions.actions.Cache
 import io.github.typesafegithub.workflows.actions.actions.Checkout
-import io.github.typesafegithub.workflows.actions.actions.SetupJava
 import io.github.typesafegithub.workflows.actions.gradle.ActionsSetupGradle
 import io.github.typesafegithub.workflows.domain.RunnerType.UbuntuLatest
 import io.github.typesafegithub.workflows.domain.RunnerType.WindowsLatest
@@ -133,14 +132,7 @@ workflow(
         runsOn = UbuntuLatest,
     ) {
         uses(action = Checkout())
-        uses(
-            name = "Set up Java in proper version",
-            action = SetupJava(
-                javaVersion = "17",
-                distribution = SetupJava.Distribution.Zulu,
-                cache = SetupJava.BuildPlatform.Gradle,
-            ),
-        )
+        setupJava()
         run(command = "cd .github/workflows")
         run(
             name = "Regenerate all workflow YAMLs",

.github/workflows/build.yaml

@@ -55,8 +55,9 @@ jobs:
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '11'
+        java-version: '22'
         distribution: 'zulu'
+        cache: 'gradle'
     - id: 'step-3'
       uses: 'gradle/actions/setup-gradle@v4'
       with:
@@ -82,8 +83,9 @@ jobs:
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '11'
+        java-version: '22'
         distribution: 'zulu'
+        cache: 'gradle'
     - id: 'step-3'
       uses: 'gradle/actions/setup-gradle@v4'
       with:
@@ -109,8 +111,9 @@ jobs:
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '11'
+        java-version: '22'
         distribution: 'zulu'
+        cache: 'gradle'
     - id: 'step-2'
       uses: 'gradle/actions/setup-gradle@v4'
     - id: 'step-3'
@@ -178,10 +181,10 @@ jobs:
     - id: 'step-0'
       uses: 'actions/checkout@v5'
     - id: 'step-1'
-      name: 'Set up Java in proper version'
+      name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '17'
+        java-version: '22'
         distribution: 'zulu'
         cache: 'gradle'
     - id: 'step-2'

.github/workflows/end-to-end-tests-2nd-workflow.yaml

@@ -20,8 +20,9 @@ jobs:
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '11'
+        java-version: '22'
         distribution: 'zulu'
+        cache: 'gradle'
     - id: 'step-2'
       uses: 'gradle/actions/setup-gradle@v4'
     - id: 'step-3'
@@ -45,8 +46,9 @@ jobs:
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '11'
+        java-version: '22'
         distribution: 'zulu'
+        cache: 'gradle'
     - id: 'step-2'
       uses: 'gradle/actions/setup-gradle@v4'
     - id: 'step-3'

.github/workflows/end-to-end-tests.main.kts

@@ -11,6 +11,8 @@
 @file:DependsOn("Wandalen:wretry.action:v3")
 @file:OptIn(ExperimentalKotlinLogicStep::class)
 
+@file:Import("setup-java.main.kts")
+
 import io.github.typesafegithub.workflows.actions.actions.*
 import io.github.typesafegithub.workflows.actions.gradle.ActionsSetupGradle
 import io.github.typesafegithub.workflows.actions.wandalen.WretryAction
@@ -31,13 +33,7 @@ import io.github.typesafegithub.workflows.updates.reportAvailableUpdates
 import java.time.Instant
 
 fun JobBuilder<*>.publishToMavenLocal() {
-    uses(
-        name = "Set up JDK",
-        action = SetupJava(
-            javaVersion = "11",
-            distribution = SetupJava.Distribution.Zulu,
-        ),
-    )
+    setupJava()
     uses(action = ActionsSetupGradle())
     run(
         name = "Publish to Maven local",

.github/workflows/end-to-end-tests.yaml

@@ -22,8 +22,9 @@ jobs:
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '11'
+        java-version: '22'
         distribution: 'zulu'
+        cache: 'gradle'
     - id: 'step-2'
       uses: 'gradle/actions/setup-gradle@v4'
     - id: 'step-3'
@@ -129,8 +130,9 @@ jobs:
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '11'
+        java-version: '22'
         distribution: 'zulu'
+        cache: 'gradle'
     - id: 'step-16'
       uses: 'gradle/actions/setup-gradle@v4'
     - id: 'step-17'

.github/workflows/release.yaml

@@ -54,8 +54,9 @@ jobs:
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '11'
+        java-version: '22'
         distribution: 'zulu'
+        cache: 'gradle'
     - id: 'step-2'
       uses: 'gradle/actions/setup-gradle@v4'
     - id: 'step-3'

.github/workflows/setup-java.main.kts

@@ -12,7 +12,8 @@ fun JobBuilder<*>.setupJava() =
     uses(
         name = "Set up JDK",
         action = SetupJava(
-            javaVersion = "11",
+            javaVersion = "22",
             distribution = SetupJava.Distribution.Zulu,
+            cache = SetupJava.BuildPlatform.Gradle,
         )
     )

buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm-server.gradle.kts

@@ -20,26 +20,10 @@ dependencies {
 java {
     withJavadocJar()
     withSourcesJar()
-
-    toolchain {
-        requiredJdkVersion()
-    }
-}
-
-kotlin {
-    jvmToolchain {
-        requiredJdkVersion()
-    }
-}
-
-fun JavaToolchainSpec.requiredJdkVersion() {
-    languageVersion.set(JavaLanguageVersion.of(17))
 }
 
 tasks.withType<KotlinCompile> {
     compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_17)
-
         allWarningsAsErrors.set(true)
 
         freeCompilerArgs.addAll(

buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts

@@ -18,22 +18,12 @@ dependencies {
 }
 
 java {
+    // It's available without extra setup on GitHub Actions runners.
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+
     withJavadocJar()
     withSourcesJar()
-
-    toolchain {
-        requiredJdkVersion()
-    }
-}
-
-kotlin {
-    jvmToolchain {
-        requiredJdkVersion()
-    }
-}
-
-fun JavaToolchainSpec.requiredJdkVersion() {
-    languageVersion.set(JavaLanguageVersion.of(11))
 }
 
 tasks.withType<KotlinCompile> {
@@ -50,6 +40,8 @@ tasks.withType<KotlinCompile> {
     }
 }
 
+
+
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
 }