Move krpc-test to commonMain

Author: Mr3zee

krpc/krpc-test/build.gradle.kts

@@ -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.
  */
 
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
@@ -22,11 +22,7 @@ kotlin {
                 // Workaround for
                 // KLIB resolver: Could not find "org.jetbrains.kotlinx:atomicfu"
                 api(libs.atomicfu)
-            }
-        }
 
-        jvmMain {
-            dependencies {
                 api(projects.krpc.krpcCore)
                 api(projects.krpc.krpcServer)
                 api(projects.krpc.krpcClient)
@@ -35,6 +31,12 @@ kotlin {
 
                 implementation(libs.serialization.core)
                 implementation(libs.kotlin.test)
+                implementation(libs.coroutines.test)
+            }
+        }
+
+        jvmMain {
+            dependencies {
                 implementation(libs.kotlin.test.junit)
             }
         }
@@ -72,7 +74,7 @@ tasks.named<Delete>("clean") {
     delete(resourcesPath.walk().filter { it.isFile && it.extension == tmpExt }.toList())
 }
 
-tasks.create("moveToGold") {
+tasks.register("moveToGold") {
     doLast {
         resourcesPath.walk().forEach {
             if (it.isFile && it.extension == tmpExt) {

krpc/krpc-test/src/commonMain/kotlin/Stub.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.krpc.test

…/kotlinx/rpc/krpc/test/KrpcTestClient.kt …/kotlinx/rpc/krpc/test/KrpcTestClient.ktkrpc/krpc-test/src/jvmMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestClient.kt renamed to krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestClient.kt krpc/krpc-test/src/jvmMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestClient.kt renamed to krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestClient.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.krpc.test

…/kotlinx/rpc/krpc/test/KrpcTestServer.kt …/kotlinx/rpc/krpc/test/KrpcTestServer.ktkrpc/krpc-test/src/jvmMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestServer.kt renamed to krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestServer.kt krpc/krpc-test/src/jvmMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestServer.kt renamed to krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestServer.kt

@@ -11,8 +11,37 @@ import kotlinx.rpc.RemoteService
 import kotlinx.rpc.annotations.Rpc
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
-import java.time.LocalDate
-import java.time.LocalDateTime
+
+data class LocalDate(
+    val year: Int,
+    val month: Int,
+    val day: Int,
+) {
+    override fun toString(): String {
+        return "$year-$month-$day"
+    }
+
+    companion object {
+        fun parse(str: String): LocalDate = str.split('-').let {
+            LocalDate(it[0].toInt(), it[1].toInt(), it[2].toInt())
+        }
+    }
+}
+
+data class LocalDateTime(
+    val date: LocalDate,
+    val time: String,
+) {
+    override fun toString(): String {
+        return "$date $time"
+    }
+
+    companion object {
+        fun parse(str: String): LocalDateTime = str.split(' ').let {
+            LocalDateTime(LocalDate.parse(it[0]), it[1])
+        }
+    }
+}
 
 @Suppress("detekt.TooManyFunctions")
 @Rpc

…kotlinx/rpc/krpc/test/KrpcTestService.kt …kotlinx/rpc/krpc/test/KrpcTestService.ktkrpc/krpc-test/src/jvmMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestService.kt renamed to krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestService.kt krpc/krpc-test/src/jvmMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestService.kt renamed to krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestService.kt

@@ -7,9 +7,6 @@ package kotlinx.rpc.krpc.test
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import kotlinx.serialization.Serializable
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.resumeWithException
 import kotlin.test.assertContentEquals
@@ -110,11 +107,18 @@ class KrpcTestServiceBackend(override val coroutineContext: CoroutineContext) :
     }
 
     override suspend fun nonSerializableClass(localDate: LocalDate): LocalDate {
-        return localDate.plusDays(1)
+        return LocalDate(localDate.year, localDate.month, localDate.day + 1)
     }
 
     override suspend fun nonSerializableClassWithSerializer(localDateTime: LocalDateTime): String {
-        return localDateTime.plusDays(1).format(DateTimeFormatter.ISO_DATE_TIME)
+        return LocalDateTime(
+            date = LocalDate(
+                year = localDateTime.date.year,
+                month = localDateTime.date.month,
+                day = localDateTime.date.day + 1,
+            ),
+            time = localDateTime.time,
+        ).toString()
     }
 
     override suspend fun incomingStreamSyncCollect(arg1: Flow<String>): Int {
@@ -240,9 +244,9 @@ class KrpcTestServiceBackend(override val coroutineContext: CoroutineContext) :
 
     override suspend fun throwsUNSTOPPABLEThrowable(message: String) {
         suspendCancellableCoroutine<Unit> { continuation ->
-            Thread {
+            runThreadIfPossible {
                 continuation.resumeWithException(Throwable(message))
-            }.start()
+            }
         }
     }
 
@@ -320,3 +324,5 @@ class KrpcTestServiceBackend(override val coroutineContext: CoroutineContext) :
         return state
     }
 }
+
+internal expect fun runThreadIfPossible(runner: () -> Unit)