Update main

.github/workflows/labels.yml

@@ -15,10 +15,10 @@ jobs:
   check-labels:
     name: Check labels
     runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'release') && !contains(github.event.pull_request.labels.*.name, 'feature') && !contains(github.event.pull_request.labels.*.name, 'bug') && !contains(github.event.pull_request.labels.*.name, 'breaking') && !contains(github.event.pull_request.labels.*.name, 'infra') && !contains(github.event.pull_request.labels.*.name, 'docs') && !contains(github.event.pull_request.labels.*.name, 'deprecation') && !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'housekeeping') }}
+    if: ${{ github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'release') && !contains(github.event.pull_request.labels.*.name, 'feature') && !contains(github.event.pull_request.labels.*.name, 'bug') && !contains(github.event.pull_request.labels.*.name, 'breaking') && !contains(github.event.pull_request.labels.*.name, 'infra') && !contains(github.event.pull_request.labels.*.name, 'docs') && !contains(github.event.pull_request.labels.*.name, 'deprecation') && !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'housekeeping') && !contains(github.event.pull_request.labels.*.name, 'Main Branch Update') }}
     steps:
       - name: Fail build after no labels present
         run: |
           echo "Pull request does not contain any required labels"
-          echo "Please use at least one of 'feature', 'bug', 'breaking', 'infra', 'docs', 'deprecation', 'release', 'housekeeping' or 'dependencies' labels"
+          echo "Please use at least one of 'feature', 'bug', 'breaking', 'infra', 'docs', 'deprecation', 'release', 'housekeeping', 'Main Branch Update' or 'dependencies' labels"
           exit 1

docs/pages/kotlinx-rpc/topics/platforms.topic

@@ -117,14 +117,6 @@
 <td><list><li>apple<list><li>ios<list><li>iosArm64</li><li>iosSimulatorArm64</li><li>iosX64</li></list></li><li>macos<list><li>macosArm64</li><li>macosX64</li></list></li><li>watchos<list><li>watchosArm64</li><li>watchosSimulatorArm64</li><li>watchosX64</li></list></li><li>tvos<list><li>tvosArm64</li><li>tvosSimulatorArm64</li><li>tvosX64</li></list></li></list></li><li>linux<list><li>linuxArm64</li><li>linuxX64</li></list></li><li>windows<list><li>mingwX64</li></list></li></list></td>
 </tr>
 
-<tr>
-<td>krpc-test</td>
-<td>jvm</td>
-<td><list><li>browser</li><li>node</li></list></td>
-<td><list><li>wasmJs<list><li>browser</li><li>node</li></list></li><li>wasmWasi<list><li>node</li></list></li></list></td>
-<td><list><li>apple<list><li>ios<list><li>iosArm64</li><li>iosSimulatorArm64</li><li>iosX64</li></list></li><li>macos<list><li>macosArm64</li><li>macosX64</li></list></li><li>watchos<list><li>watchosArm64</li><li>watchosSimulatorArm64</li><li>watchosX64</li></list></li><li>tvos<list><li>tvosArm64</li><li>tvosSimulatorArm64</li><li>tvosX64</li></list></li></list></li><li>linux<list><li>linuxArm64</li><li>linuxX64</li></list></li><li>windows<list><li>mingwX64</li></list></li></list></td>
-</tr>
-
 <tr>
 <td>krpc-ktor-client</td>
 <td>jvm</td>

krpc/krpc-client/src/commonMain/kotlin/kotlinx/rpc/krpc/client/KrpcClient.kt

@@ -217,6 +217,8 @@ public abstract class KrpcClient : RpcClient, KrpcEndpoint {
                 transport = initializeTransport()
                 isTransportReady = true
 
+                internalScope // access scope to initialize it
+
                 connector.subscribeToGenericMessages(::handleGenericMessage)
                 connector.subscribeToProtocolMessages(::handleProtocolMessage)
 

settings.gradle.kts

@@ -38,7 +38,7 @@ includePublic(":krpc:krpc-core")
 includePublic(":krpc:krpc-client")
 includePublic(":krpc:krpc-server")
 includePublic(":krpc:krpc-logging")
-includePublic(":krpc:krpc-test")
+include(":krpc:krpc-test")
 
 include(":krpc:krpc-serialization")
 includePublic(":krpc:krpc-serialization:krpc-serialization-core")

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

@@ -113,6 +113,9 @@ tasks.test {
 
     useJUnitPlatform()
 
+    systemProperty("idea.ignore.disabled.plugins", "true")
+    systemProperty("idea.home.path", rootDir)
+
     systemPropertyLogged("kotlinx.rpc.globalRootDir", globalRootDir)
     systemPropertyLogged("kotlin.test.update.test.data", updateTestData)
 

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/AbstractBoxTest.kt

@@ -4,14 +4,16 @@
 
 package kotlinx.rpc.codegen.test.runners
 
+import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_IR
 import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_REFLECT
+import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTestBase
 import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider
 import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
 
-open class AbstractBoxTest : BaseTestRunner() {
+open class AbstractBoxTest : AbstractFirBlackBoxCodegenTestBase(FirParser.LightTree) {
     override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider {
         return EnvironmentBasedStandardLibrariesPathProvider
     }

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/AbstractDiagnosticTest.kt

@@ -4,9 +4,17 @@
 
 package kotlinx.rpc.codegen.test.runners
 
+import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.runners.AbstractFirPhasedDiagnosticTest
+import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider
+import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
+
+open class AbstractDiagnosticTest : AbstractFirPhasedDiagnosticTest(FirParser.LightTree) {
+    override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider {
+        return EnvironmentBasedStandardLibrariesPathProvider
+    }
 
-open class AbstractDiagnosticTest : BaseTestRunner() {
     override fun configure(builder: TestConfigurationBuilder) {
         super.configure(builder)
 

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/BaseTestRunner.kt

@@ -7,30 +7,10 @@ package kotlinx.rpc.codegen.test.runners
 import kotlinx.rpc.codegen.test.services.ExtensionRegistrarConfigurator
 import kotlinx.rpc.codegen.test.services.RpcCompileClasspathProvider
 import kotlinx.rpc.codegen.test.services.RpcRuntimeClasspathProvider
-import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
-import org.jetbrains.kotlin.test.initIdeaConfiguration
-import org.jetbrains.kotlin.test.runners.AbstractFirPhasedDiagnosticTest
-import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider
-import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
-import org.junit.jupiter.api.BeforeAll
-
-abstract class BaseTestRunner : AbstractFirPhasedDiagnosticTest(FirParser.LightTree) {
-    companion object {
-        @BeforeAll
-        @JvmStatic
-        fun setUp() {
-            initIdeaConfiguration()
-        }
-    }
-
-    override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider {
-        return EnvironmentBasedStandardLibrariesPathProvider
-    }
-}
 
 fun TestConfigurationBuilder.commonFirWithPluginFrontendConfiguration() {
     defaultDirectives {