Fix KRPC-137

Mr3zee · Mr3zee · commit c0888a3b9330 · 2025-02-06T19:22:58.000+01:00
diff --git a/krpc/krpc-client/build.gradle.kts b/krpc/krpc-client/build.gradle.kts
@@ -18,11 +18,6 @@ kotlin {
             dependencies {
                 api(projects.krpc.krpcCore)
 
-                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
-                implementation(projects.core)
-                implementation(projects.utils)
-                implementation(projects.krpc.krpcSerialization.krpcSerializationCore)
-
                 implementation(libs.serialization.core)
                 implementation(libs.kotlin.reflect)
 
diff --git a/krpc/krpc-core/build.gradle.kts b/krpc/krpc-core/build.gradle.kts
@@ -20,9 +20,6 @@ kotlin {
                 api(projects.krpc.krpcSerialization.krpcSerializationCore)
                 implementation(projects.krpc.krpcLogging)
 
-                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
-                implementation(projects.utils)
-
                 api(libs.coroutines.core)
                 implementation(libs.serialization.core)
                 implementation(libs.kotlin.reflect)
diff --git a/krpc/krpc-ktor/krpc-ktor-client/build.gradle.kts b/krpc/krpc-ktor/krpc-ktor-client/build.gradle.kts
@@ -14,10 +14,6 @@ kotlin {
                 api(projects.krpc.krpcClient)
                 api(projects.krpc.krpcKtor.krpcKtorCore)
 
-                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
-                implementation(projects.krpc.krpcCore)
-                implementation(projects.core)
-
                 api(libs.ktor.client.core)
                 api(libs.ktor.client.websockets)
 
diff --git a/krpc/krpc-ktor/krpc-ktor-core/build.gradle.kts b/krpc/krpc-ktor/krpc-ktor-core/build.gradle.kts
@@ -14,10 +14,6 @@ kotlin {
             dependencies {
                 api(projects.krpc.krpcCore)
 
-                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
-                implementation(projects.core)
-                implementation(projects.utils)
-
                 implementation(libs.ktor.websockets)
                 implementation(libs.coroutines.core)
                 implementation(libs.serialization.core)
diff --git a/krpc/krpc-server/build.gradle.kts b/krpc/krpc-server/build.gradle.kts
@@ -18,11 +18,6 @@ kotlin {
             dependencies {
                 api(projects.krpc.krpcCore)
 
-                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
-                implementation(projects.core)
-                implementation(projects.utils)
-                implementation(projects.krpc.krpcSerialization.krpcSerializationCore)
-
                 implementation(projects.krpc.krpcLogging)
 
                 implementation(libs.serialization.core)
diff --git a/tests/compiler-plugin-tests/src/test-gen/kotlinx/rpc/codegen/test/runners/BoxTestGenerated.java b/tests/compiler-plugin-tests/src/test-gen/kotlinx/rpc/codegen/test/runners/BoxTestGenerated.java
@@ -10,8 +10,6 @@
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TargetBackend;
 import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.Ignore;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -21,7 +19,6 @@
 @SuppressWarnings("all")
 @TestMetadata("src/testData/box")
 @TestDataPath("$PROJECT_ROOT")
-@Disabled("KRPC-137")
 public class BoxTestGenerated extends AbstractBoxTest {
   @Test
   public void testAllFilesPresentInBox() {
diff --git a/tests/compiler-plugin-tests/src/test-gen/kotlinx/rpc/codegen/test/runners/DiagnosticTestGenerated.java b/tests/compiler-plugin-tests/src/test-gen/kotlinx/rpc/codegen/test/runners/DiagnosticTestGenerated.java
@@ -9,16 +9,15 @@
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+
 import java.io.File;
 import java.util.regex.Pattern;
 
 /** This class is generated by {@link kotlinx.rpc.codegen.test.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("src/testData/diagnostics")
 @TestDataPath("$PROJECT_ROOT")
-@Disabled("KRPC-137")
 public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
   @Test
   public void testAllFilesPresentInDiagnostics() {
diff --git a/tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/GenerateTests.kt b/tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/GenerateTests.kt
@@ -4,19 +4,20 @@
 
 package kotlinx.rpc.codegen.test
 
+import kotlinx.rpc.codegen.test.runners.AbstractBoxTest
+import kotlinx.rpc.codegen.test.runners.AbstractDiagnosticTest
 import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
 
 fun main() {
     generateTestGroupSuiteWithJUnit5 {
         testGroup(testDataRoot = "src/testData", testsRoot = "src/test-gen") {
-            // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
-//            testClass<AbstractDiagnosticTest> {
-//                model("diagnostics")
-//            }
+            testClass<AbstractDiagnosticTest> {
+                model("diagnostics")
+            }
 
-//            testClass<AbstractBoxTest> {
-//                model("box")
-//            }
+            testClass<AbstractBoxTest> {
+                model("box")
+            }
         }
     }
 }
diff --git a/tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/services/RpcClasspathProviders.kt b/tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/services/RpcClasspathProviders.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.test.services
@@ -22,12 +22,12 @@ private class RuntimeDependency(
     val name: String,
 ) {
     val filter = FilenameFilter { _, filename ->
-        filename.startsWith(name) && filename.endsWith(".jar")
+        filename.startsWith(name) && filename.endsWith(".jar") && !filename.contains("sources")
     }
 }
 
 private object RpcClasspathProvider {
-    private val TEST_RUNTIME = RuntimeDependency("build/libs/", "compiler-plugin-test")
+    private val TEST_RUNTIME = RuntimeDependency("build/libs/", "compiler-plugin-tests")
     private val KRPC_CORE_JVM = RuntimeDependency("$globalRootDir/krpc/krpc-core/build/libs/", "krpc-core-jvm")
     private val CORE_JVM = RuntimeDependency("$globalRootDir/core/build/libs/", "core-jvm")
     private val UTILS_JVM = RuntimeDependency("$globalRootDir/utils/build/libs/", "utils-jvm")
diff --git a/tests/compiler-plugin-tests/src/testData/diagnostics/rpcChecked.fir.txt b/tests/compiler-plugin-tests/src/testData/diagnostics/rpcChecked.fir.txt
@@ -85,3 +85,23 @@ FILE: rpcChecked.kt
         R|kotlinx/rpc/descriptor/serviceDescriptorOf|<R|NotAService|>()
         R|kotlinx/rpc/descriptor/serviceDescriptorOf|<R|T|>()
     }
+    @R|kotlinx/rpc/annotations/Rpc|() public final annotation class Grpc : R|kotlin/Annotation| {
+        public constructor(): R|Grpc| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    @R|Grpc|() public abstract interface MyGrpcService : R|kotlin/Any| {
+    }
+    @R|Grpc|() public final class WrongGrpcTarget : R|kotlin/Any| {
+        public constructor(): R|WrongGrpcTarget| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    @R|kotlinx/rpc/annotations/Rpc|() public final class WrongRpcTarget : R|kotlin/Any| {
+        public constructor(): R|WrongRpcTarget| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
diff --git a/tests/compiler-plugin-tests/src/testData/diagnostics/rpcChecked.kt b/tests/compiler-plugin-tests/src/testData/diagnostics/rpcChecked.kt
@@ -29,11 +29,11 @@ inline suspend fun <@Rpc reified T : Any> ok(client: RpcClient, server: RpcServe
     server.registerService<MyService> { MyServiceImpl(it) }
     server.registerService<T> { impl }
 
-    myServiceImpl.awaitFieldInitialization<MyService>()
-    myServiceImpl.awaitFieldInitialization<MyService, Int> { 1 }
+    myServiceImpl.<!DEPRECATION!>awaitFieldInitialization<!><MyService>()
+    myServiceImpl.<!DEPRECATION!>awaitFieldInitialization<!><MyService, Int> { 1 }
 
-    impl.awaitFieldInitialization<T>()
-    impl.awaitFieldInitialization<T, Int> { 1 }
+    impl.<!DEPRECATION!>awaitFieldInitialization<!><T>()
+    impl.<!DEPRECATION!>awaitFieldInitialization<!><T, Int> { 1 }
 
     serviceDescriptorOf<MyService>()
     serviceDescriptorOf<T>()
@@ -48,14 +48,14 @@ inline suspend fun <reified T : Any> fail(client: RpcClient, server: RpcServer,
     server.registerService<<!CHECKED_ANNOTATION_VIOLATION!>NotAService<!>> { NotAService(it) }
     server.registerService<<!CHECKED_ANNOTATION_VIOLATION!>T<!>> { impl }
 
-    myServiceImpl.awaitFieldInitialization<<!CHECKED_ANNOTATION_VIOLATION!>MyServiceImpl<!>>()
-    myServiceImpl.awaitFieldInitialization<<!CHECKED_ANNOTATION_VIOLATION!>MyServiceImpl<!>, Int> { 1 }
+    myServiceImpl.<!DEPRECATION!>awaitFieldInitialization<!><<!CHECKED_ANNOTATION_VIOLATION!>MyServiceImpl<!>>()
+    myServiceImpl.<!DEPRECATION!>awaitFieldInitialization<!><<!CHECKED_ANNOTATION_VIOLATION!>MyServiceImpl<!>, Int> { 1 }
 
-    notAServiceImpl.awaitFieldInitialization<<!CHECKED_ANNOTATION_VIOLATION!>NotAService<!>>()
-    notAServiceImpl.awaitFieldInitialization<<!CHECKED_ANNOTATION_VIOLATION!>NotAService<!>, Int> { 1 }
+    notAServiceImpl.<!DEPRECATION!>awaitFieldInitialization<!><<!CHECKED_ANNOTATION_VIOLATION!>NotAService<!>>()
+    notAServiceImpl.<!DEPRECATION!>awaitFieldInitialization<!><<!CHECKED_ANNOTATION_VIOLATION!>NotAService<!>, Int> { 1 }
 
-    impl.awaitFieldInitialization<<!CHECKED_ANNOTATION_VIOLATION!>T<!>>()
-    impl.awaitFieldInitialization<<!CHECKED_ANNOTATION_VIOLATION!>T<!>, Int> { 1 }
+    impl.<!DEPRECATION!>awaitFieldInitialization<!><<!CHECKED_ANNOTATION_VIOLATION!>T<!>>()
+    impl.<!DEPRECATION!>awaitFieldInitialization<!><<!CHECKED_ANNOTATION_VIOLATION!>T<!>, Int> { 1 }
 
     serviceDescriptorOf<<!CHECKED_ANNOTATION_VIOLATION!>MyServiceImpl<!>>()
     serviceDescriptorOf<<!CHECKED_ANNOTATION_VIOLATION!>NotAService<!>>()
@@ -68,8 +68,8 @@ annotation class Grpc
 @Grpc
 interface MyGrpcService
 
-@Grpc
+<!WRONG_RPC_ANNOTATION_TARGET!>@Grpc<!>
 class WrongGrpcTarget
 
-@Rpc
+<!WRONG_RPC_ANNOTATION_TARGET!>@Rpc<!>
 class WrongRpcTarget
