From b686e042c8f88bcd542a4a1f41b45ad056f1b056 Mon Sep 17 00:00:00 2001 From: Dmitry Khalanskiy Date: Mon, 8 May 2023 12:17:48 +0200 Subject: [PATCH] Try once more to restore binary compatibility in `runTest` Fixes #3673 --- kotlinx-coroutines-test/api/kotlinx-coroutines-test.api | 2 +- kotlinx-coroutines-test/common/src/TestBuilders.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kotlinx-coroutines-test/api/kotlinx-coroutines-test.api b/kotlinx-coroutines-test/api/kotlinx-coroutines-test.api index a41502b2e1..64639f24a1 100644 --- a/kotlinx-coroutines-test/api/kotlinx-coroutines-test.api +++ b/kotlinx-coroutines-test/api/kotlinx-coroutines-test.api @@ -22,7 +22,7 @@ public final class kotlinx/coroutines/test/TestBuildersKt { public static final fun runTest (Lkotlinx/coroutines/test/TestScope;JLkotlin/jvm/functions/Function2;)V public static synthetic fun runTest$default (Lkotlin/coroutines/CoroutineContext;JLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V public static synthetic fun runTest$default (Lkotlinx/coroutines/test/TestCoroutineScope;JLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V - public static final synthetic fun runTest$default (Lkotlinx/coroutines/test/TestScope;Ljava/lang/Long;Lkotlin/jvm/functions/Function2;Ljava/lang/Integer;Ljava/lang/Object;)V + public static final synthetic fun runTest$default (Lkotlinx/coroutines/test/TestScope;JLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V public static final fun runTest-8Mi8wO0 (Lkotlin/coroutines/CoroutineContext;JLkotlin/jvm/functions/Function2;)V public static final fun runTest-8Mi8wO0 (Lkotlinx/coroutines/test/TestScope;JLkotlin/jvm/functions/Function2;)V public static synthetic fun runTest-8Mi8wO0$default (Lkotlin/coroutines/CoroutineContext;JLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V diff --git a/kotlinx-coroutines-test/common/src/TestBuilders.kt b/kotlinx-coroutines-test/common/src/TestBuilders.kt index 8ae075a706..9fca5dc946 100644 --- a/kotlinx-coroutines-test/common/src/TestBuilders.kt +++ b/kotlinx-coroutines-test/common/src/TestBuilders.kt @@ -578,8 +578,8 @@ internal expect fun dumpCoroutines() @JvmName("runTest\$default") @Suppress("DEPRECATION", "UNUSED_PARAMETER") public fun TestScope.runTestLegacy( - dispatchTimeoutMs: Long?, + dispatchTimeoutMs: Long, testBody: suspend TestScope.() -> Unit, - unused1: Int?, + unused1: Int, unused2: Any?, -): TestResult = runTest(dispatchTimeoutMs ?: 60_000, testBody) +): TestResult = runTest(dispatchTimeoutMs, testBody)