grpc: Remove JVM Generator related code

Signed-off-by: Johannes Zottele <[email protected]>

Author: Jozott00

gradle-plugin/src/main/kotlin/kotlinx/rpc/buf/BufExtensions.kt

@@ -5,19 +5,19 @@
 package kotlinx.rpc.buf
 
 import kotlinx.rpc.buf.tasks.BufExecTask
+import kotlinx.rpc.proto.ProtocPlugin
 import org.gradle.api.Action
 import org.gradle.api.Project
-import org.gradle.api.provider.Property
-import org.gradle.kotlin.dsl.property
-import java.io.File
-import javax.inject.Inject
-import kotlin.time.Duration
-import kotlinx.rpc.proto.ProtocPlugin
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.listProperty
+import org.gradle.kotlin.dsl.property
+import java.io.File
+import javax.inject.Inject
 import kotlin.reflect.KClass
+import kotlin.time.Duration
 
 /**
  * Options for the Buf tasks.
@@ -100,14 +100,14 @@ public open class BufExtension @Inject constructor(objects: ObjectFactory) {
  * Allows registering custom Buf tasks that can operate on the generated workspace.
  */
 public open class BufTasksExtension @Inject constructor(internal val project: Project) {
-    // TODO change to commonMain/commonTest in docs when it's supported KRPC-180
+
     /**
      * Registers a custom Buf task that operates on the generated workspace.
      *
      * Name conventions:
      * `lint` input for [name] will result in tasks
      * named 'bufLintMain' and 'bufLintTest' for Kotlin/JVM projects
-     * and 'bufLintJvmMain' and 'bufLintJvmTest' for Kotlin/Multiplatform projects.
+     * and 'bufLintCommonMain' and 'bufLintCommonTest' for Kotlin/Multiplatform projects.
      *
      * Note the by default 'test' task doesn't depend on 'main' task.
      */
@@ -127,14 +127,14 @@ public open class BufTasksExtension @Inject constructor(internal val project: Pr
         return provider
     }
 
-    // TODO change to commonMain/commonTest in docs when it's supported KRPC-180
+
     /**
      * Registers a custom Buf task that operates on the generated workspace.
      *
      * Name conventions:
      * `lint` input for [name] will result in tasks
      * named 'bufLintMain' and 'bufLintTest' for Kotlin/JVM projects
-     * and 'bufLintJvmMain' and 'bufLintJvmTest' for Kotlin/Multiplatform projects.
+     * and 'bufLintCommonMain' and 'bufLintCommonTest' for Kotlin/Multiplatform projects.
      *
      * Note the by default 'test' task doesn't depend on 'main' task.
      */

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

@@ -96,13 +96,11 @@ internal fun Project.createProtoExtensions() {
     }
 
     project.withKotlinKmpExtension {
-        findOrCreateAndConfigure("jvmMain", null)
-        findOrCreateAndConfigure("jvmTest", null)
         findOrCreateAndConfigure("commonMain", null)
         findOrCreateAndConfigure("commonTest", null)
 
         sourceSets.configureEach {
-            if (name == "jvmMain" || name == "jvmTest" || name == "commonMain" || name == "commonTest") {
+            if (name == "commonMain" || name == "commonTest") {
                 findOrCreateAndConfigure(name, this)
             }
         }

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

@@ -9,17 +9,7 @@ import org.gradle.testkit.runner.TaskOutcome
 import org.intellij.lang.annotations.Language
 import org.junit.jupiter.api.TestInstance
 import java.nio.file.Path
-import kotlin.io.path.ExperimentalPathApi
-import kotlin.io.path.absolutePathString
-import kotlin.io.path.deleteRecursively
-import kotlin.io.path.exists
-import kotlin.io.path.extension
-import kotlin.io.path.isRegularFile
-import kotlin.io.path.pathString
-import kotlin.io.path.readLines
-import kotlin.io.path.relativeTo
-import kotlin.io.path.walk
-import kotlin.lazy
+import kotlin.io.path.*
 import kotlin.test.assertEquals
 import kotlin.test.fail
 
@@ -229,7 +219,7 @@ abstract class GrpcBaseTest : BaseTest() {
     }
 
     companion object {
-        private const val KMP_SOURCE_SET = "jvm"
+        private const val KMP_SOURCE_SET = "common"
         private val KMP_SOURCE_SET_CAPITAL = KMP_SOURCE_SET.replaceFirstChar(Char::uppercaseChar)
         private const val KOTLIN_MULTIPLATFORM_DIR = "kotlin-multiplatform"
         const val RPC_INTERNAL = "_rpc_internal"

gradle-plugin/src/test/resources/projects/GrpcKmpProjectTest/main_and_test_mixed_sources/src/jvmMain/proto/some.proto renamed to gradle-plugin/src/test/resources/projects/GrpcKmpProjectTest/main_and_test_mixed_sources/src/commonMain/proto/some.proto

@@ -11,6 +11,6 @@ plugins {
 
 // should nonetheless be available
 protoSourceSets {
-    jvmMain {}
-    jvmTest {}
+    commonMain {}
+    commonTest {}
 }

gradle-plugin/src/test/resources/projects/GrpcKmpProjectTest/main_and_test_mixed_sources/src/jvmTest/proto/other.proto renamed to gradle-plugin/src/test/resources/projects/GrpcKmpProjectTest/main_and_test_mixed_sources/src/commonTest/proto/other.proto

@@ -16,6 +16,6 @@ kotlin {
 
 // should nonetheless be available
 protoSourceSets {
-    jvmMain {}
-    jvmTest {}
+    commonMain {}
+    commonTest {}
 }

gradle-plugin/src/test/resources/projects/GrpcKmpProjectTest/minimal_grpc_configuration/src/jvmMain/proto/some.proto renamed to gradle-plugin/src/test/resources/projects/GrpcKmpProjectTest/minimal_grpc_configuration/src/commonMain/proto/some.proto

@@ -16,8 +16,8 @@ kotlin {
 }
 
 protoSourceSets {
-    jvmMain {}
-    jvmTest {}
+    commonMain {}
+    commonTest {}
 }
 
 rpc {