From af65cf2f7f0a41c324c563321612a12027e9934c Mon Sep 17 00:00:00 2001 From: Maria Sokolova Date: Thu, 24 Oct 2024 14:47:20 +0200 Subject: [PATCH] Remove star import of the packages, which contain conflicting declarations. Star imports of `java.util.concurrent.atomic.*` and `kotlin.concurrent.*` will lead to the compilation error: once Atomic classes are introduced in `kotlin.concurrent` package, they will conflict with Java atomic classes, which have the same names. --- kotlinx-coroutines-core/jvm/test/jdk8/future/FutureTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlinx-coroutines-core/jvm/test/jdk8/future/FutureTest.kt b/kotlinx-coroutines-core/jvm/test/jdk8/future/FutureTest.kt index 34534c8eb1..81178e193c 100644 --- a/kotlinx-coroutines-core/jvm/test/jdk8/future/FutureTest.kt +++ b/kotlinx-coroutines-core/jvm/test/jdk8/future/FutureTest.kt @@ -10,7 +10,7 @@ import java.util.concurrent.* import java.util.concurrent.atomic.* import java.util.concurrent.locks.* import java.util.function.* -import kotlin.concurrent.* +import kotlin.concurrent.withLock import kotlin.coroutines.* import kotlin.reflect.* import kotlin.test.*