Skip to content

Commit 81f4dad

Browse files
qwwdfsadpablobaxter
authored andcommitted
Update Kotlin to 1.6.20 (Kotlin#3235)
1 parent 3bd6516 commit 81f4dad

File tree

5 files changed

+2
-41
lines changed

5 files changed

+2
-41
lines changed

benchmarks/src/jmh/kotlin/benchmarks/ParametrizedDispatcherBase.kt

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ abstract class ParametrizedDispatcherBase : CoroutineScope {
2525
private var closeable: Closeable? = null
2626

2727
@Setup
28-
@UseExperimental(InternalCoroutinesApi::class)
2928
open fun setup() {
3029
coroutineContext = when {
3130
dispatcher == "fjp" -> ForkJoinPool.commonPool().asCoroutineDispatcher()

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Kotlin
66
version=1.6.1-SNAPSHOT
77
group=org.jetbrains.kotlinx
8-
kotlin_version=1.6.0
8+
kotlin_version=1.6.20
99

1010
# Dependencies
1111
junit_version=4.12

kotlinx-coroutines-core/jvm/test/DispatcherKeyTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.junit.Test
88
import kotlin.coroutines.*
99
import kotlin.test.*
1010

11-
@UseExperimental(ExperimentalStdlibApi::class)
11+
@OptIn(ExperimentalStdlibApi::class)
1212
class DispatcherKeyTest : TestBase() {
1313

1414
companion object CustomInterceptor : AbstractCoroutineContextElement(ContinuationInterceptor),

kotlinx-coroutines-test/common/test/TestDispatchersTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ class TestDispatchersTest: OrderedExecutionTestBase() {
2323

2424
/** Tests that asynchronous execution of tests does not happen concurrently with [AfterTest]. */
2525
@Test
26-
@NoJs
2726
fun testMainMocking() = runTest {
2827
val mainAtStart = TestMainDispatcher.currentTestDispatcher
2928
assertNotNull(mainAtStart)

kotlinx-coroutines-test/js/test/FailingTests.kt

-37
This file was deleted.

0 commit comments

Comments
 (0)