Use compat-patrouille for compatibility settings

Author: Mr3zee

dokka-plugin/build.gradle.kts

@@ -12,10 +12,6 @@ version = libs.versions.kotlinx.rpc.get()
 
 logger.lifecycle("[Dokka Plugin] kotlinx.rpc project version: $version, Kotlin version: ${libs.versions.kotlin.lang.get()}")
 
-kotlin {
-    jvmToolchain(8)
-}
-
 dependencies {
     compileOnly(libs.dokka.core)
     compileOnly(libs.dokka.base)

gradle-conventions/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
     implementation(libs.dokka.gradle.plugin)
     implementation(libs.gradle.doctor.gradle.plugin)
     implementation(libs.gradle.publish.gradle.plugin)
+    implementation(libs.compat.patrouille.gradle.plugin)
 
     implementation(libs.kover.gradle.plugin)
 

gradle-conventions/src/main/kotlin/conventions-jvm.gradle.kts

@@ -1,9 +1,11 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 @file:OptIn(ExperimentalAbiValidation::class)
 
+import compat.patrouille.configureJavaCompatibility
+import compat.patrouille.configureKotlinCompatibility
 import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation
 import util.configureAbiFilters
 import util.enableAbiValidation
@@ -18,11 +20,10 @@ java {
     withSourcesJar()
 }
 
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    }
+configureJavaCompatibility(8)
+configureKotlinCompatibility("2.0.0")
 
+kotlin {
     explicitApi()
 
     abiValidation {

gradle-conventions/src/main/kotlin/conventions-kmp.gradle.kts

@@ -4,6 +4,8 @@
 
 @file:OptIn(ExperimentalAbiValidation::class)
 
+import compat.patrouille.configureJavaCompatibility
+import compat.patrouille.configureKotlinCompatibility
 import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation
 import util.*
 import util.targets.configureJs
@@ -38,3 +40,6 @@ withKmpConfig {
 }
 
 configureJvm(isKmp = true)
+
+configureJavaCompatibility(8)
+configureKotlinCompatibility("2.0.0")

gradle-conventions/src/main/kotlin/conventions-kotlin-version.gradle.kts

@@ -2,10 +2,7 @@
  * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import util.withKotlinJvmExtension
 import util.withKotlinKmpExtension
 
@@ -16,27 +13,10 @@ fun KotlinProjectExtension.optInForRpcApi() {
     }
 }
 
-/**
- * Set the compatibility mode to the lower supported language version.
- *
- * This should be lined up with the minimal supported compiler plugin version.
- *
- * We update the language version only for the 'main' sources sets.
- * This makes our tests execute against the latest compiler plugin version (for example, with K2 instead of K1).
- */
-fun KotlinCommonCompilerOptions.setProjectLanguageVersion() {
-    languageVersion.set(KotlinVersion.KOTLIN_2_0)
-    apiVersion.set(KotlinVersion.KOTLIN_2_0)
-}
-
 withKotlinJvmExtension {
     optInForRpcApi()
-
-    compilerOptions.setProjectLanguageVersion()
 }
 
 withKotlinKmpExtension {
     optInForRpcApi()
-
-    compilerOptions.setProjectLanguageVersion()
 }

gradle-conventions/src/main/kotlin/util/targets/configure.kt

@@ -60,10 +60,6 @@ fun KmpConfig.configureKotlinExtension(action: Action<KotlinMultiplatformExtensi
 
         configureDetekt(includedTargets)
 
-        jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of(8))
-        }
-
         action.execute(this)
     }
 }

krpc/krpc-test/build.gradle.kts

@@ -16,17 +16,20 @@ plugins {
     alias(libs.plugins.atomicfu)
 }
 
-tasks.withType<KotlinCompile> {
-    if (this.name.contains("Test")) {
-        compilerOptions {
-            // for kotlin.time.Clock API
-            languageVersion.set(KotlinVersion.KOTLIN_2_1)
-            apiVersion.set(KotlinVersion.KOTLIN_2_1)
+kotlin {
+    targets.all {
+        compilations.matching {
+            it.name.lowercase().endsWith("test")
+        }.all {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    languageVersion.set(KotlinVersion.KOTLIN_2_1)
+                    apiVersion.set(KotlinVersion.KOTLIN_2_1)
+                }
+            }
         }
     }
-}
 
-kotlin {
     sourceSets {
         commonMain {
             dependencies {

versions-root/libs.versions.toml

@@ -28,6 +28,7 @@ detekt-gradle-plugin = "1.23.8"
 kover = "0.9.1"
 develocity = "3.19.2"
 common-custom-user-data = "2.3"
+compat-patrouille = "0.0.0"
 
 [libraries]
 # kotlinx.rpc – references to the included builds
@@ -110,6 +111,7 @@ kover-gradle-plugin = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", ve
 dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 gradle-doctor-gradle-plugin = { module = "com.osacky.doctor:doctor-plugin", version.ref = "gradle-doctor" }
 gradle-publish-gradle-plugin = { module = "com.gradle.publish:plugin-publish-plugin", version.ref = "gradle-plugin-publish" }
+compat-patrouille-gradle-plugin = { module = "com.gradleup.compat.patrouille:compat-patrouille-gradle-plugin", version.ref = "compat-patrouille" }
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-lang" }