Update Kotlin to 1.6.20 (Kotlin#3235)

pablobaxter · Sep 14, 2022 · 81f4dad · 81f4dad
1 parent 3bd6516
commit 81f4dad
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 41 deletions.
diff --git a/benchmarks/src/jmh/kotlin/benchmarks/ParametrizedDispatcherBase.kt b/benchmarks/src/jmh/kotlin/benchmarks/ParametrizedDispatcherBase.kt
@@ -25,7 +25,6 @@ abstract class ParametrizedDispatcherBase : CoroutineScope {
     private var closeable: Closeable? = null
 
     @Setup
-    @UseExperimental(InternalCoroutinesApi::class)
     open fun setup() {
         coroutineContext = when {
             dispatcher == "fjp" -> ForkJoinPool.commonPool().asCoroutineDispatcher()

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@
 # Kotlin
 version=1.6.1-SNAPSHOT
 group=org.jetbrains.kotlinx
-kotlin_version=1.6.0
+kotlin_version=1.6.20
 
 # Dependencies
 junit_version=4.12

diff --git a/kotlinx-coroutines-core/jvm/test/DispatcherKeyTest.kt b/kotlinx-coroutines-core/jvm/test/DispatcherKeyTest.kt
@@ -8,7 +8,7 @@ import org.junit.Test
 import kotlin.coroutines.*
 import kotlin.test.*
 
-@UseExperimental(ExperimentalStdlibApi::class)
+@OptIn(ExperimentalStdlibApi::class)
 class DispatcherKeyTest : TestBase() {
 
     companion object CustomInterceptor : AbstractCoroutineContextElement(ContinuationInterceptor),

diff --git a/kotlinx-coroutines-test/common/test/TestDispatchersTest.kt b/kotlinx-coroutines-test/common/test/TestDispatchersTest.kt
@@ -23,7 +23,6 @@ class TestDispatchersTest: OrderedExecutionTestBase() {
 
     /** Tests that asynchronous execution of tests does not happen concurrently with [AfterTest]. */
     @Test
-    @NoJs
     fun testMainMocking() = runTest {
         val mainAtStart = TestMainDispatcher.currentTestDispatcher
         assertNotNull(mainAtStart)

diff --git a/kotlinx-coroutines-test/js/test/FailingTests.kt b/kotlinx-coroutines-test/js/test/FailingTests.kt