Use compat-patrouille for compatibility settings

build.gradle.kts

@@ -9,7 +9,6 @@ plugins {
     alias(libs.plugins.kotlinx.rpc) apply false
     alias(libs.plugins.atomicfu) apply false
     alias(libs.plugins.conventions.kover)
-    alias(libs.plugins.conventions.gradle.doctor)
     alias(libs.plugins.conventions.root)
 }
 

compiler-plugin/build.gradle.kts

@@ -5,7 +5,7 @@
 import util.whenForIde
 
 plugins {
-    alias(libs.plugins.conventions.gradle.doctor)
+    id("empty") // resolve conventions classpath
 }
 
 val rpcVersion: String = libs.versions.kotlinx.rpc.get()

dokka-plugin/build.gradle.kts

@@ -3,7 +3,6 @@
  */
 
 plugins {
-    alias(libs.plugins.conventions.gradle.doctor)
     alias(libs.plugins.kotlin.jvm)
 }
 
@@ -12,10 +11,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

@@ -10,8 +10,8 @@ dependencies {
     implementation(libs.kotlin.gradle.plugin)
     implementation(libs.detekt.gradle.plugin)
     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/empty.gradle.kts

@@ -0,0 +1,6 @@
+/*
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+// DON'T DELETE.
+// Resolves conventions classpath where no other convention is applied

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)
     }
 }

gradle-plugin/build.gradle.kts

@@ -13,7 +13,6 @@ plugins {
     alias(libs.plugins.conventions.jvm)
     alias(libs.plugins.conventions.gradle.publish)
     alias(libs.plugins.gradle.plugin.publish)
-    alias(libs.plugins.conventions.gradle.doctor)
 }
 
 group = "org.jetbrains.kotlinx"