Update after rebase

Author: Mr3zee

.idea/kotlinx-rpc.iml

@@ -23,7 +23,7 @@ import kotlin.io.resolve
 // works with the cinterop-c Bazel project
 fun KotlinMultiplatformExtension.configureCLibCInterop(
     project: Project,
-    bazelBuildArg: String,
+    bazelTask: String,
     configureCinterop: NamedDomainObjectContainer<DefaultCInteropSettings>.(cinteropCLib: File) -> Unit,
 ) {
     val globalRootDir: String by project.extra
@@ -46,7 +46,7 @@ fun KotlinMultiplatformExtension.configureCLibCInterop(
     val buildCinteropCLib = project.tasks.register<Exec>("buildCinteropCLib") {
         group = "build"
         workingDir = cinteropCLib
-        commandLine("bash", "-c", "bazel build $bazelBuildArg --config=release")
+        commandLine("bash", "-c", "bazel build $bazelTask --config=release")
         inputs.files(project.fileTree(cinteropCLib) { exclude("bazel-*/**") })
         outputs.dir(cinteropCLib.resolve("bazel-bin"))
 

gradle-conventions/src/main/kotlin/util/cinterop.kt

@@ -27,7 +27,7 @@ import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
 import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import javax.inject.Inject
 
 internal open class DefaultProtocExtension @Inject constructor(
@@ -176,7 +176,7 @@ internal open class DefaultProtocExtension @Inject constructor(
 
         protoSourceSet.generateTask.set(bufGenerateTask)
 
-        tasks.withType<KotlinCompile>().configureEach {
+        project.tasks.withType<KotlinCompilationTask<*>>().all {
             // compileKotlin - main
             // compileTestKotlin - test
             // compileKotlinJvm - jvmMain
@@ -191,7 +191,7 @@ internal open class DefaultProtocExtension @Inject constructor(
             }
         }
 
-        tasks.withType<JavaCompile>().configureEach {
+        project.tasks.withType<JavaCompile>().all {
             // compileJvmTestJava - test (java, kmp)
             // compileJvmMainJava - main (java, kmp)
             // compileJava - main (java)

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

@@ -67,7 +67,7 @@ kotlin {
         val libgrpcpp_c by creating {
             includeDirs(
                 cinteropCLib.resolve("include"),
-                cinteropCLib.resolve("bazel-grpcpp-c/external/grpc+/include"),
+                cinteropCLib.resolve("bazel-cinterop-c/external/grpc+/include"),
             )
             extraOpts(
                 "-libraryPath", "${cinteropCLib.resolve("bazel-out/darwin_arm64-opt/bin")}",

grpc/grpc-core/build.gradle.kts

@@ -2,7 +2,7 @@
  * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package kotlinx.rpc.grpc.pb
+package kotlinx.rpc.protobuf.internal
 
 public sealed class ProtobufException : RuntimeException {
     protected constructor(message: String, cause: Throwable? = null) : super(message, cause)
@@ -37,4 +37,4 @@ public class ProtobufDecodingException : ProtobufException {
 
 public class ProtobufEncodingException : ProtobufException {
     public constructor(message: String, cause: Throwable? = null) : super(message, cause)
-}
+}

protobuf/protobuf-core/src/commonMain/kotlin/kotlinx/rpc/protobuf/internal/ProtobufException.kt

@@ -4,8 +4,6 @@
 
 package kotlinx.rpc.protobuf.internal
 
-import kotlinx.rpc.grpc.pb.ProtobufDecodingException
-
 internal expect fun WireDecoder.pushLimit(byteLen: Int): Int
 internal expect fun WireDecoder.popLimit(limit: Int)
 internal expect fun WireDecoder.bytesUntilLimit(): Int

protobuf/protobuf-core/src/commonMain/kotlin/kotlinx/rpc/protobuf/internal/readPacked.kt

@@ -18,6 +18,7 @@ import kotlinx.rpc.grpc.test.*
 import kotlinx.rpc.grpc.test.common.*
 import kotlinx.rpc.grpc.test.common.invoke
 import kotlinx.rpc.grpc.test.invoke
+import kotlinx.rpc.protobuf.internal.ProtobufDecodingException
 import kotlinx.rpc.protobuf.internal.WireEncoder
 import test.nested.*
 import test.nested.invoke

protobuf/protobuf-core/src/commonTest/kotlin/kotlinx/rpc/protobuf/test/ProtosTest.kt

@@ -5,10 +5,12 @@
 package kotlinx.rpc.protobuf.test
 
 import kotlinx.io.Buffer
+import kotlinx.rpc.protobuf.internal.ProtobufDecodingException
 import kotlinx.rpc.protobuf.internal.WireDecoder
 import kotlinx.rpc.protobuf.internal.WireEncoder
 import kotlinx.rpc.protobuf.internal.WireSize
 import kotlinx.rpc.protobuf.internal.WireType
+import kotlinx.rpc.protobuf.internal.checkForPlatformDecodeException
 import kotlinx.rpc.protobuf.internal.packedEnum
 import kotlinx.rpc.protobuf.internal.packedInt32
 import kotlinx.rpc.protobuf.internal.packedInt64

protobuf/protobuf-core/src/commonTest/kotlin/kotlinx/rpc/protobuf/test/WireCodecTest.kt

@@ -182,7 +182,7 @@ class ModelToProtobufKotlinCommonGenerator(
             function("encode", modifiers = "override", args = "value: $msgFqName", returnType = sourceFqName) {
                 code("val buffer = $bufferFqName()")
                 code("val encoder = $PB_PKG.WireEncoder(buffer)")
-                scope("${kotlinx.rpc.protobuf.PB_PKG}.checkForPlatformEncodeException", nlAfterClosed = false) {
+                scope("${PB_PKG}.checkForPlatformEncodeException", nlAfterClosed = false) {
                     code("value.asInternal().encodeWith(encoder)")
                 }
                 code("encoder.flush()")
@@ -192,7 +192,7 @@ class ModelToProtobufKotlinCommonGenerator(
             function("decode", modifiers = "override", args = "stream: $sourceFqName", returnType = msgFqName) {
                 scope("$PB_PKG.WireDecoder(stream as $bufferFqName).use") {
                     code("val msg = ${declaration.internalClassFullName()}()")
-                    scope("${kotlinx.rpc.protobuf.PB_PKG}.checkForPlatformDecodeException", nlAfterClosed = false) {
+                    scope("${PB_PKG}.checkForPlatformDecodeException", nlAfterClosed = false) {
                         code("${declaration.internalClassFullName()}.decodeWith(msg, it)")
                     }
                     code("msg.checkRequiredFields()")
@@ -525,7 +525,7 @@ class ModelToProtobufKotlinCommonGenerator(
 
         requiredFields.forEach { field ->
             ifBranch(condition = "!presenceMask[${field.presenceIdx}]", ifBlock = {
-                code("throw ${kotlinx.rpc.protobuf.PB_PKG}.ProtobufDecodingException.missingRequiredField(\"${declaration.name.simpleName}\", \"${field.name}\")")
+                code("throw ${PB_PKG}.ProtobufDecodingException.missingRequiredField(\"${declaration.name.simpleName}\", \"${field.name}\")")
             })
         }