Skip to content

Commit dfa1b63

Browse files
authored
Update Kotlin (#2902)
* Update Kotlin to 1.5.30 * Add new M1 targets
1 parent 50807d0 commit dfa1b63

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
[![official JetBrains project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
44
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
55
[![Download](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.5.1)](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.5.1/pom)
6-
[![Kotlin](https://img.shields.io/badge/kotlin-1.5.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
6+
[![Kotlin](https://img.shields.io/badge/kotlin-1.5.30-blue.svg?logo=kotlin)](http://kotlinlang.org)
77
[![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/)
88

99
Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
10-
This is a companion version for the Kotlin `1.5.20` release.
10+
This is a companion version for the Kotlin `1.5.30` release.
1111

1212
```kotlin
1313
suspend fun main() = coroutineScope {
@@ -91,7 +91,7 @@ And make sure that you use the latest Kotlin version:
9191

9292
```xml
9393
<properties>
94-
<kotlin.version>1.5.20</kotlin.version>
94+
<kotlin.version>1.5.30</kotlin.version>
9595
</properties>
9696
```
9797

@@ -109,7 +109,7 @@ And make sure that you use the latest Kotlin version:
109109

110110
```groovy
111111
buildscript {
112-
ext.kotlin_version = '1.5.20'
112+
ext.kotlin_version = '1.5.30'
113113
}
114114
```
115115

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
# Kotlin
66
version=1.5.1-SNAPSHOT
77
group=org.jetbrains.kotlinx
8-
kotlin_version=1.5.20
8+
kotlin_version=1.5.30
99

1010
# Dependencies
1111
junit_version=4.12
1212
junit5_version=5.7.0
13-
atomicfu_version=0.16.2
13+
atomicfu_version=0.16.3
1414
knit_version=0.3.0
1515
html_version=0.7.2
1616
lincheck_version=2.14

gradle/compile-native-multiplatform.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ kotlin {
2525
addTarget(presets.watchosArm64)
2626
addTarget(presets.watchosX86)
2727
addTarget(presets.watchosX64)
28+
addTarget(presets.iosSimulatorArm64)
29+
addTarget(presets.watchosSimulatorArm64)
30+
addTarget(presets.tvosSimulatorArm64)
31+
addTarget(presets.macosArm64)
2832
}
2933

3034
sourceSets {

kotlinx-coroutines-core/common/test/CoroutineDispatcherOperatorFunInvokeTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ class CoroutineDispatcherOperatorFunInvokeTest : TestBase() {
6565
dispatcher.dispatch(context, block)
6666
}
6767

68-
@ExperimentalCoroutinesApi
6968
override fun isDispatchNeeded(context: CoroutineContext): Boolean {
7069
return dispatcher.isDispatchNeeded(context)
7170
}

kotlinx-coroutines-core/common/test/flow/VirtualTime.kt

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ internal class VirtualTimeDispatcher(enclosingScope: CoroutineScope) : Coroutine
4848
originalDispatcher.dispatch(context, block)
4949
}
5050

51-
@ExperimentalCoroutinesApi
5251
override fun isDispatchNeeded(context: CoroutineContext): Boolean = originalDispatcher.isDispatchNeeded(context)
5352

5453
override fun invokeOnTimeout(timeMillis: Long, block: Runnable, context: CoroutineContext): DisposableHandle {

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

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ object FieldWalker {
8989
cur = ref.parent
9090
path += "[${ref.index}]"
9191
}
92+
else -> error("Should not be reached")
9293
}
9394
}
9495
path.reverse()

0 commit comments

Comments
 (0)