Fix compilation

Author: Mr3zee

compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RpcIrServiceProcessor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * 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.codegen.extension
@@ -9,15 +9,16 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.util.hasAnnotation
+import org.jetbrains.kotlin.ir.util.isInterface
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 
 internal class RpcIrServiceProcessor(
     @Suppress("unused")
     private val logger: MessageCollector,
 ) : IrElementTransformer<RpcIrContext> {
     override fun visitClass(declaration: IrClass, data: RpcIrContext): IrStatement {
-        if (declaration.hasAnnotation(RpcClassId.rpcAnnotation)
-            || declaration.hasAnnotation(RpcClassId.grpcAnnotation)
+        if ((declaration.hasAnnotation(RpcClassId.rpcAnnotation)
+            || declaration.hasAnnotation(RpcClassId.grpcAnnotation)) && declaration.isInterface
         ) {
             processService(declaration, data)
         }

compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/FirRpcSupertypeGeneratorAbstract.kt

@@ -1,13 +1,15 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * 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.codegen
 
 import kotlinx.rpc.codegen.common.RpcClassId
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.declarations.FirClass
 import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration
+import org.jetbrains.kotlin.fir.declarations.utils.isInterface
 import org.jetbrains.kotlin.fir.extensions.FirDeclarationPredicateRegistrar
 import org.jetbrains.kotlin.fir.extensions.FirSupertypeGenerationExtension
 import org.jetbrains.kotlin.fir.extensions.predicateBasedProvider
@@ -24,7 +26,10 @@ abstract class FirRpcSupertypeGeneratorAbstract(
     }
 
     override fun needTransformSupertypes(declaration: FirClassLikeDeclaration): Boolean {
-        return session.predicateBasedProvider.matches(FirRpcPredicates.rpc, declaration)
+        return session.predicateBasedProvider.matches(
+            predicate = FirRpcPredicates.rpc,
+            declaration = declaration,
+        ) && declaration is FirClass && declaration.isInterface
     }
 
     protected fun computeAdditionalSupertypesAbstract(

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/Status.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 @file:Suppress("MemberVisibilityCanBePrivate")
@@ -30,6 +30,6 @@ public interface Status {
         DATA_LOSS(15),
         UNAUTHENTICATED(16);
 
-        public val valueAscii: ByteArray = value.toString().toByteArray(Charsets.US_ASCII)
+        public val valueAscii: ByteArray = value.toString().encodeToByteArray()
     }
 }

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

@@ -6,4 +6,4 @@
 
 package kotlinx.rpc.grpc
 
-internal actual typealias ServerServiceDefinition = io.grpc.ServerServiceDefinition
+public actual typealias ServerServiceDefinition = io.grpc.ServerServiceDefinition

protobuf-plugin/src/main/kotlin/kotlinx/rpc/protobuf/ModelToKotlinGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * 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.protobuf
@@ -275,7 +275,7 @@ class ModelToKotlinGenerator(
                 name = "definitionFor",
                 modifiers = "override",
                 args = "impl: ${service.name.simpleName}",
-                returnType = "kotlinx.rpc.grpc.internal.ServerServiceDefinition",
+                returnType = "kotlinx.rpc.grpc.ServerServiceDefinition",
             ) {
                 scope("return ${service.name.simpleName}ServerDelegate(impl).bindService()")
             }

versions-root/libs.versions.toml

@@ -100,7 +100,7 @@ grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
 grpc-util = { module = "io.grpc:grpc-util", version.ref = "grpc" }
 grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" }
 grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
-grpc-kotlin-stub = { module = "io.grpc:grpc-protobuf", version.ref = "grpc-kotlin" }
+grpc-kotlin-stub = { module = "io.grpc:grpc-kotlin-stub", version.ref = "grpc-kotlin" }
 grpc-protoc-gen-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc" }
 grpc-protoc-gen-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpc-kotlin" }