Update to Kotlin 2.3.20

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kgp = "2.3.0"
+kgp = "2.3.20"
 nmcp = "1.4.3"
 nmcp-build-time = "1.4.4-SNAPSHOT-7b0410ef4061d1249c7b161698764b8194838354"
 mosaic = "0.19.0-gradleup.0"
@@ -20,10 +20,10 @@ gradle-api = "dev.gradleplugins:gradle-api:8.8"
 gratatouille-gradle-plugin = "com.gradleup.gratatouille:com.gradleup.gratatouille.gradle.plugin:0.2.2"
 jsonpath = "com.eygraber:jsonpathkt-kotlinx:3.0.2"
 jsonpathkt = "com.eygraber:jsonpathkt-kotlinx:3.0.2"
-kgp-compile-only = "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.20-Beta1"
+kgp-compile-only = "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.20"
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kgp" }
 ksp-gradle-plugin = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.3.3"
-librarian-gradle-plugin = "com.gradleup.librarian:librarian-gradle-plugin:0.2.2-SNAPSHOT-05f300b66924ec4c98ed4afcc6eed459fd08806b"
+librarian-gradle-plugin = "com.gradleup.librarian:librarian-gradle-plugin:0.2.2-SNAPSHOT-c2127df7d03b2946fc025bf67d31cac3e2c5a397"
 maven-sympathy = "com.gradleup.maven-sympathy:maven-sympathy:0.0.2"
 mockserver = "com.apollographql.mockserver:apollo-mockserver:0.0.3"
 # forked for https://github.com/JakeWharton/mosaic/pull/1100

librarian-core/api/librarian-core.api

@@ -101,6 +101,7 @@ public final class com/gradleup/librarian/core/tooling/SemverKt {
 	public static final fun nextPatch (Lcom/gradleup/librarian/core/tooling/SemVer;)Lcom/gradleup/librarian/core/tooling/SemVer;
 	public static final fun nextPrerelease (Lcom/gradleup/librarian/core/tooling/SemVer;)Lcom/gradleup/librarian/core/tooling/SemVer;
 	public static final fun semVerOrNull (Ljava/lang/String;)Lcom/gradleup/librarian/core/tooling/SemVer;
+	public static final fun semVerOrThrow (Ljava/lang/String;)Lcom/gradleup/librarian/core/tooling/SemVer;
 }
 
 public final class com/gradleup/librarian/core/tooling/Tag_and_bumpKt {

librarian-core/src/main/kotlin/com/gradleup/librarian/core/tooling/semver.kt

@@ -194,6 +194,9 @@ fun SemVer.next(): SemVer {
     }
   }
 }
+fun String.semVerOrThrow(): SemVer {
+  return semVerOrNull() ?: error("Cannot parse $this as a SemVer string")
+}
 
 fun String.semVerOrNull(): SemVer? {
   val regex1 = Regex("([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)")

librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/bcv.kt

@@ -1,13 +1,15 @@
+@file:OptIn(ExperimentalAbiValidation::class)
+
 package com.gradleup.librarian.gradle
 
+import com.gradleup.librarian.core.tooling.semVerOrThrow
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.abi.AbiValidationExtension
 import org.jetbrains.kotlin.gradle.dsl.abi.AbiValidationMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
-@OptIn(ExperimentalAbiValidation::class)
 fun Project.configureBcv(
   warnIfMissing: Boolean = true,
   excludePatterns: List<String> = emptyList(),
@@ -29,20 +31,38 @@ fun Project.configureBcv(
             it.exclude.byNames.addAll(excludePatterns)
           }
         }
-         else -> error("Librarian: unknown abiValidation extension type: '${abiValidation.javaClass.name}'")
+        else -> error("Librarian: unknown abiValidation extension type: '${abiValidation.javaClass.name}'")
       }
 
-      tasks.named("build") {
-        it.dependsOn("checkLegacyAbi")
-      }
+      // See https://kotlinlang.org/docs/whatsnew2320.html#improvements-to-binary-compatibility-validation-in-kgp
+      val kgpVersion = this@configureBcv.getKotlinPluginVersion().semVerOrThrow()
+
       /**
        * Compatibility tasks to not break the brain muscle
        */
-      tasks.register("apiDump") {
-        it.dependsOn("updateLegacyAbi")
-      }
-      tasks.register("apiCheck") {
-        it.dependsOn("checkLegacyAbi")
+      if (kgpVersion >= "2.3.20".semVerOrThrow()) {
+        tasks.register("apiDump") {
+          it.dependsOn("updateKotlinAbi")
+          it.doLast {
+            println("`apiDump` is deprecated. Use `updateKotlinAbi` instead")
+          }
+        }
+        tasks.register("apiCheck") {
+          it.dependsOn("checkKotlinAbi")
+          it.doLast {
+            println("`apiCheck` is deprecated. Use `updateKotlinAbi` instead")
+          }
+        }
+      } else {
+        tasks.named("build") {
+          it.dependsOn("checkLegacyAbi")
+        }
+        tasks.register("apiDump") {
+          it.dependsOn("updateLegacyAbi")
+        }
+        tasks.register("apiCheck") {
+          it.dependsOn("checkLegacyAbi")
+        }
       }
     } else {
       if (warnIfMissing) {

librarian.root.properties

@@ -13,3 +13,7 @@ pom.license=MIT
 
 gcs.bucket=gradleup
 gcs.prefix=m2
+
+# nmcp exposes kotlin-stdlib 2.2 in the compile classpath
+# xmlutil exposes kotlin-stdlib 2.3 in the runtime classpath
+checkDependenciesCompatibility=false