grpc-pb: Address review comments

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

Author: Jozott00

grpc/grpc-core/build.gradle.kts

@@ -152,15 +152,6 @@ rpc {
         }
 
         project.tasks.withType<BufGenerateTask>().configureEach {
-
-            // TODO: Remove this once we remove JVM generation
-            // Set compile for common(native) option
-            if (name.endsWith("CommonTest")) {
-                protocPlugins.kotlinMultiplatform {
-                    options.put("targetMode", "common")
-                }
-            }
-
             if (name.endsWith("Test")) {
                 dependsOn(gradle.includedBuild("protoc-gen").task(":jar"))
             }

protoc-gen/src/main/kotlin/kotlinx/rpc/protobuf/codeRequestToModel.kt

@@ -21,7 +21,8 @@ fun CodeGeneratorRequest.toModel(): Model {
     val protoFileMap = protoFileList.associateBy { it.name }
     val fileDescriptors = mutableMapOf<String, Descriptors.FileDescriptor>()
 
-    val files = protoFileList.map { protoFile -> protoFile.toDescriptor(protoFileMap, fileDescriptors) }
+    val files = fileToGenerateList.map { protoFileMap[it]!! }
+        .map { protoFile -> protoFile.toDescriptor(protoFileMap, fileDescriptors) }
 
     return Model(
         files = files.map { it.toModel() }