Constraint Kotlin language version for the Gradle plugin

Author: Goooler

build.gradle.kts

@@ -2,6 +2,9 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformDependenciesExtension
 import org.jetbrains.intellij.platform.gradle.extensions.intellijPlatform
 import org.jetbrains.intellij.platform.gradle.plugins.project.IntelliJPlatformBasePlugin
+import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin.jvm) apply false
@@ -70,6 +73,17 @@ allprojects {
         }
     }
 
+    tasks.withType<JavaCompile>().configureEach {
+        options.release = libs.versions.jdkRelease.get().toInt()
+    }
+
+    tasks.withType<KotlinCompile>().configureEach {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jdkRelease.get())
+            freeCompilerArgs.add("-Xjdk-release=${libs.versions.jdkRelease.get()}")
+        }
+    }
+
     tasks.withType<Test>().configureEach {
         useJUnitPlatform()
     }

gradle/libs.versions.toml

@@ -6,6 +6,7 @@ jacoco = "0.8.13"
 kotlin = "2.2.20"
 kover = "0.9.3"
 leviathan = "3.1.0-1.8.2"
+jdkRelease = "17"
 
 [libraries]
 android-build-tools = "com.android.tools:sdk-common:31.13.0"

tools/cli/build.gradle.kts

@@ -17,17 +17,6 @@ application {
     version = versionName
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_21
-    }
-}
-
 sourceSets {
     test {
         resources.srcDir("$rootDir/components/test/sharedTestResources")

tools/gradle-plugin/build.gradle.kts

@@ -1,6 +1,10 @@
 import java.nio.file.Paths
 import java.util.Properties
 import kotlin.io.path.exists
+import org.gradle.api.plugins.JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME
+import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -15,6 +19,14 @@ tasks.validatePlugins {
     enableStricterValidation = true
 }
 
+kotlin {
+    compilerOptions {
+        // https://docs.gradle.org/current/userguide/compatibility.html#kotlin
+        apiVersion = KotlinVersion.KOTLIN_2_2
+        languageVersion = apiVersion
+    }
+}
+
 gradlePlugin {
     vcsUrl = "https://github.com/ComposeGears/Valkyrie"
     website = "https://github.com/ComposeGears/Valkyrie"
@@ -30,6 +42,14 @@ gradlePlugin {
     }
 }
 
+configurations.named(API_ELEMENTS_CONFIGURATION_NAME) {
+    attributes.attribute(
+        // TODO: https://github.com/gradle/gradle/issues/24608
+        GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
+        objects.named("9.0.0"),
+    )
+}
+
 val sharedTestResourcesDir: File =
     project(projects.components.test.path)
         .layout