Support Kotlin 2.0.21 and 2.0.20

compiler-plugin/compiler-plugin-k2/build.gradle.kts

@@ -18,6 +18,7 @@ kotlin {
 }
 
 dependencies {
+    compileOnly(libs.kotlin.reflect)
     compileOnly(libs.kotlin.compiler.embeddable)
     project.whenKotlinIsAtLeast(2, 0) {
         compileOnly(libs.serialization.plugin)

compiler-plugin/compiler-plugin-k2/src/main/latest/kotlinx/rpc/codegen/FirRPCServiceGenerator.kt → compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/FirRPCServiceGenerator.kt

@@ -24,7 +24,10 @@ import org.jetbrains.kotlin.fir.moduleData
 import org.jetbrains.kotlin.fir.plugin.*
 import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.impl.*
-import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
+import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
+import org.jetbrains.kotlin.fir.types.classId
+import org.jetbrains.kotlin.fir.types.constructClassLikeType
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
@@ -221,9 +224,11 @@ class FirRpcServiceGenerator(
             SerialEntityNames.SERIALIZER_FACTORY_INTERFACE_NAME,
         )
 
-        val ref = serializerFactoryClassId
-            .constructClassLikeType(emptyArray(), false)
-            .toFirResolvedTypeRef()
+        val ref = vsApi {
+            serializerFactoryClassId
+                .constructClassLikeType(emptyArray(), false)
+                .toFirResolvedTypeRefVS()
+        }
 
         return listOf(ref)
     }
@@ -257,7 +262,7 @@ class FirRpcServiceGenerator(
             .map { it.symbol }
 
         return createNestedClass(owner, RpcNames.SERVICE_STUB_NAME, RPCGeneratedStubKey(owner.name, functions)) {
-            visibility = owner.visibility
+            visibility = Visibilities.Public
             modality = Modality.FINAL
         }.symbol
     }

compiler-plugin/compiler-plugin-k2/src/main/latest/kotlinx/rpc/codegen/FirRpcSupertypeGenerator.kt → compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/FirRpcSupertypeGenerator.kt

@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.fir.extensions.FirSupertypeGenerationExtension
 import org.jetbrains.kotlin.fir.extensions.predicateBasedProvider
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.constructClassLikeType
-import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef
 
 class FirRpcSupertypeGenerator(
     session: FirSession,
@@ -37,9 +36,11 @@ class FirRpcSupertypeGenerator(
         }
 
         return listOf(
-            RpcClassId.remoteServiceInterface
-                .constructClassLikeType(emptyArray(), isNullable = false)
-                .toFirResolvedTypeRef()
+            vsApi {
+                RpcClassId.remoteServiceInterface
+                    .constructClassLikeType(emptyArray(), isNullable = false)
+                    .toFirResolvedTypeRefVS()
+            }
         )
     }
 }

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

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.rpc.codegen
+
+import org.jetbrains.kotlin.KtSourceElement
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
+import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
+import org.jetbrains.kotlin.fir.types.FirTypeRef
+
+interface FirVersionSpecificApi {
+    fun ConeKotlinType.toFirResolvedTypeRefVS(
+        source: KtSourceElement? = null,
+        delegatedTypeRef: FirTypeRef? = null,
+    ): FirResolvedTypeRef
+}
+
+fun <T> vsApi(body: FirVersionSpecificApi.() -> T) : T {
+    val klass = Class.forName("kotlinx.rpc.codegen.FirVersionSpecificApiImpl")
+    return (klass.kotlin.objectInstance as FirVersionSpecificApi).body()
+}

compiler-plugin/compiler-plugin-k2/src/main/latest/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.rpc.codegen
+
+import org.jetbrains.kotlin.KtSourceElement
+import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
+import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
+import org.jetbrains.kotlin.fir.types.FirTypeRef
+
+@Suppress("unused")
+object FirVersionSpecificApiImpl : FirVersionSpecificApi {
+    override fun ConeKotlinType.toFirResolvedTypeRefVS(
+        source: KtSourceElement?,
+        delegatedTypeRef: FirTypeRef?,
+    ): FirResolvedTypeRef {
+        return toFirResolvedTypeRef(source, delegatedTypeRef)
+    }
+}

compiler-plugin/compiler-plugin-k2/src/main/pre_2_0_10/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.rpc.codegen
+
+import org.jetbrains.kotlin.KtSourceElement
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
+import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
+import org.jetbrains.kotlin.fir.types.FirTypeRef
+import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef
+
+@Suppress("unused")
+object FirVersionSpecificApiImpl : FirVersionSpecificApi {
+    override fun ConeKotlinType.toFirResolvedTypeRefVS(
+        source: KtSourceElement?,
+        delegatedTypeRef: FirTypeRef?,
+    ): FirResolvedTypeRef {
+        return toFirResolvedTypeRef(source, delegatedTypeRef)
+    }
+}