Backport compiler fixes from grpc-release

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,14 +9,15 @@ 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)) {
+        if (declaration.hasAnnotation(RpcClassId.rpcAnnotation) && 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
@@ -23,7 +25,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(

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

@@ -1,14 +1,17 @@
 /*
- * 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.KtSourceElement
 import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.declarations.getAnnotationByClassId
+import org.jetbrains.kotlin.fir.declarations.toAnnotationClassId
 import org.jetbrains.kotlin.fir.expressions.FirAnnotation
+import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess
+import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate
+import org.jetbrains.kotlin.fir.extensions.predicateBasedProvider
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
 import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.SymbolInternals
@@ -23,16 +26,31 @@ fun FirClassSymbol<*>.isRemoteService(session: FirSession): Boolean = resolvedSu
     it.doesMatchesClassId(session, RpcClassId.remoteServiceInterface)
 }
 
-fun FirBasedSymbol<*>.rpcAnnotationSource(session: FirSession): KtSourceElement? {
-    return rpcAnnotation(session)?.source
+fun FirBasedSymbol<*>.rpcAnnotationSource(
+    session: FirSession,
+    predicate: DeclarationPredicate,
+    classId: ClassId?,
+): KtSourceElement? {
+    return rpcAnnotation(session, predicate, classId)?.source
 }
 
-fun FirBasedSymbol<*>.rpcAnnotation(session: FirSession): FirAnnotation? {
-    return resolvedCompilerAnnotationsWithClassIds.rpcAnnotation(session)
+fun FirBasedSymbol<*>.rpcAnnotation(
+    session: FirSession,
+    predicate: DeclarationPredicate,
+    classId: ClassId?,
+): FirAnnotation? {
+    return resolvedCompilerAnnotationsWithClassIds.rpcAnnotation(session, predicate, classId)
 }
 
-fun List<FirAnnotation>.rpcAnnotation(session: FirSession): FirAnnotation? {
-    return getAnnotationByClassId(RpcClassId.rpcAnnotation, session)
+@OptIn(UnresolvedExpressionTypeAccess::class)
+fun List<FirAnnotation>.rpcAnnotation(session: FirSession, predicate: DeclarationPredicate, classId: ClassId?): FirAnnotation? {
+    return find {
+        vsApi {
+            it.coneTypeOrNull?.toClassSymbolVS(session)?.let { declaration ->
+                session.predicateBasedProvider.matches(predicate, declaration)
+            } == true || (classId != null && it.toAnnotationClassId(session) == classId)
+        }
+    }
 }
 
 fun FirClassSymbol<*>.remoteServiceSupertypeSource(session: FirSession): KtSourceElement? {

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

@@ -7,6 +7,7 @@ package kotlinx.rpc.codegen.checkers
 import kotlinx.rpc.codegen.FirCheckersContext
 import kotlinx.rpc.codegen.FirRpcPredicates
 import kotlinx.rpc.codegen.checkers.diagnostics.FirRpcDiagnostics
+import kotlinx.rpc.codegen.common.RpcClassId
 import kotlinx.rpc.codegen.isRemoteService
 import kotlinx.rpc.codegen.remoteServiceSupertypeSource
 import kotlinx.rpc.codegen.rpcAnnotation
@@ -31,12 +32,22 @@ class FirRpcAnnotationChecker(private val ctx: FirCheckersContext) : FirRegularC
         val rpcAnnotated = context.session.predicateBasedProvider.matches(FirRpcPredicates.rpc, declaration)
         val rpcMetaAnnotated = context.session.predicateBasedProvider.matches(FirRpcPredicates.rpcMeta, declaration)
 
-        if (!declaration.isInterface && declaration.classKind != ClassKind.ANNOTATION_CLASS && rpcMetaAnnotated) {
+        val isMetaAnnotated = declaration.classKind != ClassKind.ANNOTATION_CLASS
+
+        if (!declaration.isInterface && isMetaAnnotated && rpcMetaAnnotated) {
             reporter.reportOn(
-                source = declaration.symbol.rpcAnnotationSource(context.session),
+                source = declaration.symbol.rpcAnnotationSource(
+                    session = context.session,
+                    predicate = FirRpcPredicates.rpcMeta,
+                    classId = RpcClassId.rpcAnnotation,
+                ),
                 factory = FirRpcDiagnostics.WRONG_RPC_ANNOTATION_TARGET,
                 context = context,
-                a = declaration.symbol.rpcAnnotation(context.session)?.resolvedType
+                a = declaration.symbol.rpcAnnotation(
+                    session = context.session,
+                    predicate = FirRpcPredicates.rpc,
+                    classId = RpcClassId.rpcAnnotation,
+                )?.resolvedType
                     ?: error("Unexpected unresolved annotation type for declaration: ${declaration.symbol.classId.asSingleFqName()}"),
             )
         }
@@ -49,9 +60,13 @@ class FirRpcAnnotationChecker(private val ctx: FirCheckersContext) : FirRegularC
             )
         }
 
-        if (rpcAnnotated && !ctx.serializationIsPresent) {
+        if (rpcAnnotated && !ctx.serializationIsPresent && isMetaAnnotated) {
             reporter.reportOn(
-                source = declaration.symbol.rpcAnnotationSource(context.session),
+                source = declaration.symbol.rpcAnnotationSource(
+                    session = context.session,
+                    predicate = FirRpcPredicates.rpcMeta,
+                    classId = RpcClassId.rpcAnnotation,
+                ),
                 factory = FirRpcDiagnostics.MISSING_SERIALIZATION_MODULE,
                 context = context,
             )

compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/checkers/diagnostics/FirRpcDiagnostics.kt

@@ -11,14 +11,13 @@ import org.jetbrains.kotlin.diagnostics.error0
 import org.jetbrains.kotlin.diagnostics.error1
 import org.jetbrains.kotlin.diagnostics.error2
 import org.jetbrains.kotlin.diagnostics.rendering.RootDiagnosticRendererFactory
-import org.jetbrains.kotlin.diagnostics.warning0
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtAnnotationEntry
 
 object FirRpcDiagnostics {
     val MISSING_RPC_ANNOTATION by error0<KtAnnotationEntry>()
-    val MISSING_SERIALIZATION_MODULE by warning0<KtAnnotationEntry>()
+    val MISSING_SERIALIZATION_MODULE by error0<KtAnnotationEntry>()
     val WRONG_RPC_ANNOTATION_TARGET by error1<KtAnnotationEntry, ConeKotlinType>()
     val CHECKED_ANNOTATION_VIOLATION by error1<KtAnnotationEntry, ConeKotlinType>()
     val NON_SUSPENDING_REQUEST_WITHOUT_STREAMING_RETURN_TYPE by error0<PsiElement>()

core/src/jvmMain/kotlin/kotlinx/rpc/internal/internalServiceDescriptorOf.jvm.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.internal
@@ -13,8 +13,12 @@ private const val RPC_SERVICE_STUB_SIMPLE_NAME = "\$rpcServiceStub"
 internal actual fun <@Rpc T : Any> internalServiceDescriptorOf(kClass: KClass<T>): Any? {
     val className = "${kClass.qualifiedName}\$$RPC_SERVICE_STUB_SIMPLE_NAME"
 
-    return kClass.java.classLoader
-        .loadClass(className)
-        ?.kotlin
-        ?.companionObjectInstance
+    return try {
+        return kClass.java.classLoader
+            .loadClass(className)
+            ?.kotlin
+            ?.companionObjectInstance
+    } catch (_: ClassNotFoundException) {
+        null
+    }
 }

publishLocal.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 #
-# 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.
 #
 
 set -euxo pipefail
 
 ./gradlew publishAllPublicationsToBuildRepoRepository
-./gradlew -p compiler-plugin publishAllPublicationsToBuildRepoRepository
-./gradlew -p gradle-plugin publishAllPublicationsToBuildRepoRepository
+./gradlew -p compiler-plugin publishAllPublicationsToBuildRepoRepository --no-configuration-cache
+./gradlew -p gradle-plugin publishAllPublicationsToBuildRepoRepository --no-configuration-cache