Fixed bundled KGP with the plugin

Author: Mr3zee

gradle-plugin/build.gradle.kts

@@ -29,7 +29,8 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    implementation(libs.kotlin.gradle.plugin)
+    compileOnly(libs.kotlin.gradle.plugin)
+    compileOnly(libs.android.gradle.plugin)
 
     testImplementation(libs.kotlin.gradle.plugin)
     testImplementation(gradleTestKit())
@@ -50,9 +51,17 @@ tasks.test {
 
     useJUnitPlatform()
 
-    val includedBuild = gradle.includedBuild("protoc-gen")
-    dependsOn(includedBuild.task(":grpc:publishAllPublicationsToBuildRepoRepository"))
-    dependsOn(includedBuild.task(":protobuf:publishAllPublicationsToBuildRepoRepository"))
+    val protocGen = gradle.includedBuild("protoc-gen")
+    dependsOn(protocGen.task(":grpc:publishAllPublicationsToBuildRepoRepository"))
+    dependsOn(protocGen.task(":protobuf:publishAllPublicationsToBuildRepoRepository"))
+
+    val compilerPlugin = gradle.includedBuild("compiler-plugin")
+    dependsOn(compilerPlugin.task(":compiler-plugin-cli:publishAllPublicationsToBuildRepoRepository"))
+    dependsOn(compilerPlugin.task(":compiler-plugin-k2:publishAllPublicationsToBuildRepoRepository"))
+    dependsOn(compilerPlugin.task(":compiler-plugin-backend:publishAllPublicationsToBuildRepoRepository"))
+    dependsOn(compilerPlugin.task(":compiler-plugin-common:publishAllPublicationsToBuildRepoRepository"))
+
+    dependsOn(":publishAllPublicationsToBuildRepoRepository")
 }
 
 // This block is needed to show plugin tasks on --dry-run
@@ -103,7 +112,7 @@ generateSource(
     text = """
         package kotlinx.rpc
         
-        const val KOTLIN_VERSION: String = "${libs.versions.kotlin.lang.get()}"
+        const val RPC_VERSION: String = "${libs.versions.kotlinx.rpc.get()}"
         
         const val BUILD_REPO: String = "${File(globalRootDir).resolve("build/repo").absolutePath}"
     """.trimIndent(),

gradle-plugin/src/main/kotlin/kotlinx/rpc/RpcGradlePlugin.kt

@@ -6,13 +6,16 @@ package kotlinx.rpc
 
 import kotlinx.rpc.protoc.configurePluginProtections
 import kotlinx.rpc.protoc.createProtoExtensions
+import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.create
 
 @Suppress("unused")
 public class RpcGradlePlugin : Plugin<Project> {
     override fun apply(target: Project) {
+        checkKGPIsInTheClasspath()
+
         target.extensions.create<RpcExtension>("rpc")
 
         applyCompilerPlugin(target)
@@ -28,3 +31,22 @@ public class RpcGradlePlugin : Plugin<Project> {
         target.plugins.apply(CompilerPluginCli::class.java)
     }
 }
+
+private fun checkKGPIsInTheClasspath() {
+    try {
+        Class.forName("org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin")
+    } catch (_: ClassNotFoundException) {
+        throw GradleException(
+            """
+                Kotlin Gradle plugin is not applied to the project.
+                Please ensure that Kotlin Gradle plugin is applied to the project in the plugins block:
+                
+                  plugins {
+                      kotlin("jvm") version "..." // or
+                      kotlin("multiplatform") version "..." // or
+                      kotlin("android") version "..."
+                  }
+            """.trimIndent()
+        )
+    }
+}

gradle-plugin/src/main/kotlin/kotlinx/rpc/protoc/DefaultProtoSourceSet.kt

@@ -26,7 +26,7 @@ import org.gradle.kotlin.dsl.property
 import org.gradle.kotlin.dsl.setProperty
 import org.gradle.kotlin.dsl.the
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
-import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import java.io.File
 import java.util.*
 import java.util.function.Consumer
@@ -57,7 +57,7 @@ internal open class DefaultProtoSourceSet(
     )
 
     private val explicitApiModeEnabled = project.provider {
-        project.the<KotlinBaseExtension>().explicitApi != ExplicitApiMode.Disabled
+        project.the<KotlinProjectExtension>().explicitApi != ExplicitApiMode.Disabled
     }
 
     val plugins = project.objects.setProperty<ProtocPlugin>()
@@ -137,7 +137,8 @@ internal fun Project.createProtoExtensions() {
             findOrCreateAndConfigure(name, this)
         }
 
-        project.extensions.configure<SourceSetContainer>("sourceSets") {
+        // this@createProtoExtensions: fails on KGP 2.0.0 otherwise
+        this@createProtoExtensions.project.extensions.configure<SourceSetContainer>("sourceSets") {
             all {
                 val protoSourceSet = findOrCreateAndConfigure(name, this)
 

gradle-plugin/src/test/kotlin/kotlinx/rpc/base/BaseTest.kt

@@ -17,6 +17,7 @@ import kotlin.io.path.copyToRecursively
 import kotlin.io.path.readText
 import kotlin.io.path.writeText
 import kotlinx.rpc.BUILD_REPO
+import kotlinx.rpc.RPC_VERSION
 import org.junit.jupiter.api.DynamicTest
 import java.util.stream.Stream
 import kotlin.io.path.absolute
@@ -26,7 +27,17 @@ import kotlin.io.path.deleteRecursively
 class VersionsEnv(
     val gradle: String,
     val kotlin: String,
-)
+) {
+    val kotlinSemver = run {
+        val (major, minor, patch) = kotlin.split(".").map { it.toInt() }
+        KotlinVersion(major, minor, patch)
+    }
+}
+
+internal object KtVersion {
+    val v2_2_20 = KotlinVersion(2, 2, 20)
+    val v2_0_0 = KotlinVersion(2, 0, 0)
+}
 
 private val GradleVersions = listOf(
     VersionsEnv("9.2.1", "2.2.21"),
@@ -103,6 +114,7 @@ abstract class BaseTest {
         val buildScriptFile = projectDir.resolve("build.gradle.kts")
         buildScriptFile
             .replace("<kotlin-version>", versions.kotlin)
+            .replace("<rpc-version>", RPC_VERSION)
 
         println("""
             Setup project '$projectName'
@@ -121,7 +133,6 @@ abstract class BaseTest {
             .withProjectDir(projectDir.absolute().toFile())
             .withTestKitDir(TEST_KIT_PATH.absolute().toFile())
             .withGradleVersion(versions.gradle)
-            .withPluginClasspath()
             .withArguments(
                 listOfNotNull(
                     task,
@@ -193,8 +204,9 @@ abstract class BaseTest {
         }
     }
 
-    protected fun Path.replace(oldValue: String, newValue: String) {
+    protected fun Path.replace(oldValue: String, newValue: String): Path {
         writeText(readText().replace(oldValue, newValue))
+        return this
     }
 
     companion object {

gradle-plugin/src/test/kotlin/kotlinx/rpc/base/GrpcBaseTest.kt

@@ -247,13 +247,25 @@ abstract class GrpcBaseTest : BaseTest() {
             sourceSet: SSets,
             vararg imports: SSets,
         ) {
+            if (!sourceSet.applicable()) {
+                println("Skipping ${sourceSet.capital} source set because it's not applicable for the current Kotlin version")
+                return
+            }
+
             val ktFile = "${sourceSet.capital}.kt"
-            val importsSet = imports.toSet()
+            val importsSet = imports
+                .onEach {
+                    if (!it.applicable()) {
+                        println("Skipping ${it.capital} import source set because it's not applicable for the current Kotlin version")
+                    }
+                }
+                .filter { it.applicable() }
+                .toSet()
 
             assertTaskExecuted(
                 sourceSet = sourceSet,
                 protoFiles = listOf(Path("${sourceSet.name}.proto")),
-                importProtoFiles = imports.map {
+                importProtoFiles = importsSet.map {
                     Path("${it.name}.proto")
                 },
                 generatedFiles = listOf(
@@ -319,16 +331,20 @@ abstract class GrpcBaseTest : BaseTest() {
                 .resolve(name)
                 .resolve("proto")
         }
+
+        fun SSets.applicable(): Boolean {
+            return versions.kotlinSemver >= minKotlin
+        }
     }
 
-    @Suppress("EnumEntryName")
-    enum class SSets {
+    @Suppress("EnumEntryName", "detekt.EnumNaming")
+    enum class SSets(val minKotlin: KotlinVersion = KtVersion.v2_0_0) {
         main, test,
 
         commonMain, commonTest,
         jvmMain, jvmTest,
         androidMain, androidTest,
-        webMain, webTest,
+        webMain(KtVersion.v2_2_20), webTest(KtVersion.v2_2_20),
         jsMain, jsTest,
         nativeMain, nativeTest,
         appleMain, appleTest,

gradle-plugin/src/test/resources/projects/GrpcJvmProjectTest/buf_tasks/build.gradle.kts

@@ -12,7 +12,7 @@ import javax.inject.Inject
 
 plugins {
     kotlin("jvm") version "<kotlin-version>"
-    id("org.jetbrains.kotlinx.rpc.plugin")
+    id("org.jetbrains.kotlinx.rpc.plugin") version "<rpc-version>"
 }
 
 public abstract class BufLintTask @Inject constructor(properties: BufExecTask.Properties) : BufExecTask(properties) {

gradle-plugin/src/test/resources/projects/GrpcJvmProjectTest/can_add_custom_protoc_plugins/build.gradle.kts

@@ -7,7 +7,7 @@ import kotlinx.rpc.protoc.*
 
 plugins {
     kotlin("jvm") version "<kotlin-version>"
-    id("org.jetbrains.kotlinx.rpc.plugin")
+    id("org.jetbrains.kotlinx.rpc.plugin") version "<rpc-version>"
 }
 
 rpc {

gradle-plugin/src/test/resources/projects/GrpcJvmProjectTest/custom_buf_cli_flags/build.gradle.kts

@@ -10,7 +10,7 @@ import kotlin.time.Duration.Companion.seconds
 
 plugins {
     kotlin("jvm") version "<kotlin-version>"
-    id("org.jetbrains.kotlinx.rpc.plugin")
+    id("org.jetbrains.kotlinx.rpc.plugin") version "<rpc-version>"
 }
 
 rpc {

gradle-plugin/src/test/resources/projects/GrpcJvmProjectTest/custom_protoc_plugins_must_declare_an_artifact/build.gradle.kts

@@ -7,7 +7,7 @@ import kotlinx.rpc.protoc.*
 
 plugins {
     kotlin("jvm") version "<kotlin-version>"
-    id("org.jetbrains.kotlinx.rpc.plugin")
+    id("org.jetbrains.kotlinx.rpc.plugin") version "<rpc-version>"
 }
 
 kotlin.sourceSets.main.proto {

gradle-plugin/src/test/resources/projects/GrpcJvmProjectTest/exclude_and_include_in_proto_sourcesets/build.gradle.kts

@@ -7,7 +7,7 @@ import kotlinx.rpc.protoc.*
 
 plugins {
     kotlin("jvm") version "<kotlin-version>"
-    id("org.jetbrains.kotlinx.rpc.plugin")
+    id("org.jetbrains.kotlinx.rpc.plugin") version "<rpc-version>"
 }
 
 kotlin.sourceSets.apply {