Revert to KGP 2.0.0 as a minimum requirement (#92)

* Revert to KGP 2.0.0 as a minimum requirement

* update apiDump

* fix apiDump

Author: martinbonnin

gradle/libs.versions.toml

@@ -2,33 +2,31 @@
 kgp = "2.2.0"
 
 [libraries]
+agp = "com.android.tools.build:gradle:8.2.0"
+bcv = "org.jetbrains.kotlinx:binary-compatibility-validator:0.16.3"
+bouncycastle-pg = "org.bouncycastle:bcpg-jdk18on:1.78.1"
+bouncycastle-prov = "org.bouncycastle:bcprov-jdk18on:1.78.1"
+clikt = "com.github.ajalt.clikt:clikt:3.5.0"
+compat-patrouille = "com.gradleup.compat.patrouille:compat-patrouille-gradle-plugin:0.0.0"
+compat-patrouille-at-build-time = "com.gradleup.compat.patrouille:compat-patrouille-gradle-plugin:0.0.1-SNAPSHOT-1915e48aadee473b40b4873db7f8df82057b7c59"
 coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0"
-maven-sympathy = "com.gradleup.maven-sympathy:maven-sympathy:0.0.2"
 dokkatoo = "dev.adamko.dokkatoo:dokkatoo-plugin:2.3.1"
-
+google-auth = "com.google.auth:google-auth-library-oauth2-http:1.19.0"
 gradle-api = "dev.gradleplugins:gradle-api:8.8"
-agp = "com.android.tools.build:gradle:8.2.0"
-kgp-runtime-min = "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0"
-clikt = "com.github.ajalt.clikt:clikt:3.5.0"
-mordant = "com.github.ajalt.mordant:mordant:2.7.1"
+gratatouille-gradle-plugin = "com.gradleup.gratatouille:com.gradleup.gratatouille.gradle.plugin:0.0.10"
 inquirer = "com.github.kotlin-inquirer:kotlin-inquirer:0.1.0"
-jsonpath = "com.eygraber:jsonpathkt-kotlinx:3.0.2"
-okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0"
-serialization-gradle-plugin = {module = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin", version.ref = "kgp"}
 jansi = "org.fusesource.jansi:jansi:2.4.0"
+jsonpath = "com.eygraber:jsonpathkt-kotlinx:3.0.2"
 jsonpathkt = "com.eygraber:jsonpathkt-kotlinx:3.0.2"
-mockserver = "com.apollographql.mockserver:apollo-mockserver:0.0.3"
-xmlutil = "io.github.pdvrieze.xmlutil:serialization:0.91.1"
-bouncycastle-prov = "org.bouncycastle:bcprov-jdk18on:1.78.1"
-bouncycastle-pg = "org.bouncycastle:bcpg-jdk18on:1.78.1"
-google-auth = "com.google.auth:google-auth-library-oauth2-http:1.19.0"
-compat-patrouille = "com.gradleup.compat.patrouille:compat-patrouille-gradle-plugin:0.0.0"
-
-gratatouille-gradle-plugin = "com.gradleup.gratatouille:com.gradleup.gratatouille.gradle.plugin:0.0.10"
+kgp-compile-only = "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0"
+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.2.0-2.0.2"
 librarian-gradle-plugin = "com.gradleup.librarian:librarian-gradle-plugin:0.0.11-SNAPSHOT-0b7ec36d29d52e08df13ddcf4a4785326c128579"
-compat-patrouille-at-build-time = "com.gradleup.compat.patrouille:compat-patrouille-gradle-plugin:0.0.1-SNAPSHOT-1915e48aadee473b40b4873db7f8df82057b7c59"
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kgp" }
+maven-sympathy = "com.gradleup.maven-sympathy:maven-sympathy:0.0.2"
+mockserver = "com.apollographql.mockserver:apollo-mockserver:0.0.3"
+mordant = "com.github.ajalt.mordant:mordant:2.7.1"
 nmcp = "com.gradleup.nmcp:com.gradleup.nmcp.gradle.plugin:1.0.3"
-
+okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
+serialization-gradle-plugin = {module = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin", version.ref = "kgp"}
+serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0"
+xmlutil = "io.github.pdvrieze.xmlutil:serialization:0.91.1"

librarian-gradle-plugin/build.gradle.kts

@@ -17,6 +17,7 @@ dependencies {
   implementation(libs.maven.sympathy)
   implementation(libs.okhttp)
   implementation(libs.google.auth)
+  implementation(libs.bcv)
 
   implementation(libs.bouncycastle.pg)
   implementation(libs.bouncycastle.prov)
@@ -28,7 +29,7 @@ dependencies {
 
   compileOnly(libs.gradle.api)
   compileOnly(libs.agp)
-  implementation(libs.kgp.runtime.min)
+  compileOnly(libs.kgp.compile.only)
 
   testImplementation(kotlin("test"))
   testImplementation(gradleTestKit())

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

@@ -1,20 +1,33 @@
 package com.gradleup.librarian.gradle
 
+import com.gradleup.librarian.core.tooling.init.kotlinPluginVersion
 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.ExperimentalAbiValidation
+import java.util.Properties
 
 @OptIn(ExperimentalAbiValidation::class)
-fun Project.configureBcv(block: AbiValidationExtension.() -> Unit = {}) {
+internal fun Project.configureBcv(properties: Properties?, block: AbiValidationExtension.() -> Unit = {}) {
   extensions.getByType(KotlinProjectExtension::class.java).apply {
-      this.extensions.getByName("abiValidation").apply {
-          this as AbiValidationExtension
-          enabled.set(true)
-          block()
+    val abiValidation = this.extensions.findByName("abiValidation")
+
+    if (abiValidation != null) {
+      abiValidation as AbiValidationExtension
+      abiValidation.enabled.set(true)
+      abiValidation.block()
+
+      tasks.named("build") {
+        it.dependsOn("checkLegacyAbi")
       }
+    } else {
+      if (properties != null && properties.get("bcv.warn") != "false") {
+        println("Librarian: BCV is only configured by default if using KGP 2.2+ (currently detected is '$kotlinPluginVersion'). Set bcv.warn=false in your librarian.root.properties file to remove this warning.")
+      }
+    }
   }
-  tasks.named("build") {
-    it.dependsOn("checkLegacyAbi")
-  }
+}
+
+fun Project.configureBcv(block: AbiValidationExtension.() -> Unit = {}) {
+  configureBcv(null, block)
 }

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

@@ -80,7 +80,7 @@ fun Project.librarianModule(block: AbiValidationExtension.() -> Unit = {}) {
   val rootProperties = rootProperties()
   val moduleProperties = moduleProperties()
 
-  configureBcv(block)
+  configureBcv(rootProperties, block)
 
   rootProperties.javaCompatibility()?.let {
     configureJavaCompatibility(it)