grpc-native: Address PR comments

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

Author: Jozott00

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

@@ -98,9 +98,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 == "nativeTest" || name == "commonTest") {
+            if (name == "jvmMain" || name == "jvmTest" || name == "commonMain" || name == "commonTest") {
                 findOrCreateAndConfigure(name, this)
             }
         }

grpc/grpc-core/build.gradle.kts

@@ -139,7 +139,7 @@ protoSourceSets {
         }
     }
 
-    configureEach {
+    commonTest {
         proto {
             exclude("exclude/**")
         }
@@ -163,7 +163,7 @@ rpc {
             // Set compile for common(native) option
             if (name.endsWith("CommonTest")) {
                 protocPlugins.kotlinMultiplatform {
-                    options.set(options.getOrElse(emptyMap()) + mapOf("targetMode" to "common"))
+                    options.put("targetMode", "common")
                 }
             }
 

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/pb/KTag.kt

@@ -4,6 +4,9 @@
 
 package kotlinx.rpc.grpc.pb
 
+import kotlinx.rpc.internal.utils.InternalRpcApi
+
+@InternalRpcApi
 public enum class WireType {
     VARINT, // 0
     FIXED64, // 1
@@ -13,6 +16,7 @@ public enum class WireType {
     FIXED32, // 5
 }
 
+@InternalRpcApi
 public data class KTag(val fieldNr: Int, val wireType: WireType) {
 
     init {

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/pb/WireDecoder.kt

@@ -42,7 +42,7 @@ public interface WireDecoder : AutoCloseable {
     public fun hadError(): Boolean
 
     /**
-     * When the read tag is null, it indicates EOF and the parse may stop at this point.
+     * When the read tag is null, it indicates EOF and the parser may stop at this point.
      */
     public fun readTag(): KTag?
     public fun readBool(): Boolean

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/pb/WireSize.kt

@@ -4,21 +4,52 @@
 
 package kotlinx.rpc.grpc.pb
 
+import kotlinx.rpc.internal.utils.InternalRpcApi
+
+@InternalRpcApi
 public object WireSize
 
+@InternalRpcApi
 public expect fun WireSize.int32(value: Int): Int
+
+@InternalRpcApi
 public expect fun WireSize.int64(value: Long): Int
+
+@InternalRpcApi
 public expect fun WireSize.uInt32(value: UInt): Int
+
+@InternalRpcApi
 public expect fun WireSize.uInt64(value: ULong): Int
+
+@InternalRpcApi
 public expect fun WireSize.sInt32(value: Int): Int
+
+@InternalRpcApi
 public expect fun WireSize.sInt64(value: Long): Int
 
+@InternalRpcApi
 public fun WireSize.bool(value: Boolean): Int = int32(if (value) 1 else 0)
+
+@InternalRpcApi
 public fun WireSize.enum(value: Int): Int = int32(value)
+
+@InternalRpcApi
 public fun WireSize.packedInt32(value: List<Int>): Int = value.sumOf { int32(it) }
+
+@InternalRpcApi
 public fun WireSize.packedInt64(value: List<Long>): Int = value.sumOf { int64(it) }
+
+@InternalRpcApi
 public fun WireSize.packedUInt32(value: List<UInt>): Int = value.sumOf { uInt32(it) }
+
+@InternalRpcApi
 public fun WireSize.packedUInt64(value: List<ULong>): Int = value.sumOf { uInt64(it) }
+
+@InternalRpcApi
 public fun WireSize.packedSInt32(value: List<Int>): Int = value.sumOf { sInt32(it) }
+
+@InternalRpcApi
 public fun WireSize.packedSInt64(value: List<Long>): Int = value.sumOf { sInt64(it) }
+
+@InternalRpcApi
 public fun WireSize.packedEnum(value: List<Int>): Int = value.sumOf { enum(it) }

grpc/grpc-core/src/commonTest/proto/repeated.proto

@@ -2,8 +2,6 @@ syntax = "proto3";
 
 package kotlinx.rpc.grpc.test.common;
 
-//import 'reference_package.proto';
-
 message RepeatedCommon {
   repeated fixed32 listFixed32 = 1 [packed = true];
   repeated int32 listInt32 = 2 [packed = false];

grpc/grpc-core/src/jvmMain/kotlin/kotlinx/rpc/grpc/pb/WireSize.jvm.kt

@@ -5,29 +5,36 @@
 package kotlinx.rpc.grpc.pb
 
 import com.google.protobuf.CodedOutputStream.*
+import kotlinx.rpc.internal.utils.InternalRpcApi
 
+@InternalRpcApi
 public actual fun WireSize.int32(value: Int): Int {
     return computeInt32SizeNoTag(value)
 }
 
+@InternalRpcApi
 public actual fun WireSize.int64(value: Long): Int {
     return computeInt64SizeNoTag(value)
 }
 
+@InternalRpcApi
 public actual fun WireSize.uInt32(value: UInt): Int {
     // todo check java unsigned types
     return computeUInt32SizeNoTag(value.toInt())
 }
 
+@InternalRpcApi
 public actual fun WireSize.uInt64(value: ULong): Int {
     // todo check java unsigned types
     return computeUInt64SizeNoTag(value.toLong())
 }
 
+@InternalRpcApi
 public actual fun WireSize.sInt32(value: Int): Int {
     return computeSInt32SizeNoTag(value)
 }
 
+@InternalRpcApi
 public actual fun WireSize.sInt64(value: Long): Int {
     return computeSInt64SizeNoTag(value)
 }

grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/pb/WireSize.native.kt

@@ -7,12 +7,25 @@
 package kotlinx.rpc.grpc.pb
 
 import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.rpc.internal.utils.InternalRpcApi
 import libprotowire.*
 
+@InternalRpcApi
 public actual fun WireSize.int32(value: Int): Int = pw_size_int32(value).toInt()
+
+@InternalRpcApi
 public actual fun WireSize.int64(value: Long): Int = pw_size_int64(value).toInt()
+
+@InternalRpcApi
 public actual fun WireSize.uInt32(value: UInt): Int = pw_size_uint32(value).toInt()
+
+@InternalRpcApi
 public actual fun WireSize.uInt64(value: ULong): Int = pw_size_uint64(value).toInt()
+
+@InternalRpcApi
 public actual fun WireSize.sInt32(value: Int): Int = pw_size_sint32(value).toInt()
+
+@InternalRpcApi
 public actual fun WireSize.sInt64(value: Long): Int = pw_size_sint64(value).toInt()
 
+