Skip to content

Commit bdf86fb

Browse files
authored
Update Kotlin to 2.2.0 (#4485)
1 parent 66d291b commit bdf86fb

File tree

7 files changed

+8
-17
lines changed

7 files changed

+8
-17
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
[![JetBrains official project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
55
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
66
[![Download](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.10.2)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.10.2)
7-
[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
7+
[![Kotlin](https://img.shields.io/badge/kotlin-2.2.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
88
[![KDoc link](https://img.shields.io/badge/API_reference-KDoc-blue)](https://kotlinlang.org/api/kotlinx.coroutines/)
99
[![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/)
1010

1111
Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
12-
This is a companion version for the Kotlin `2.0.0` release.
12+
This is a companion version for the Kotlin `2.2.0` release.
1313

1414
```kotlin
1515
suspend fun main() = coroutineScope {
@@ -94,7 +94,7 @@ And make sure that you use the latest Kotlin version:
9494

9595
```xml
9696
<properties>
97-
<kotlin.version>2.0.0</kotlin.version>
97+
<kotlin.version>2.2.0</kotlin.version>
9898
</properties>
9999
```
100100

@@ -113,10 +113,10 @@ And make sure that you use the latest Kotlin version:
113113
```kotlin
114114
plugins {
115115
// For build.gradle.kts (Kotlin DSL)
116-
kotlin("jvm") version "2.0.0"
116+
kotlin("jvm") version "2.2.0"
117117

118118
// For build.gradle (Groovy DSL)
119-
id "org.jetbrains.kotlin.jvm" version "2.0.0"
119+
id "org.jetbrains.kotlin.jvm" version "2.2.0"
120120
}
121121
```
122122

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ group=org.jetbrains.kotlinx
44
# First-party dependencies.
55
# ONLY rename these properties alongside adapting kotlinx.train build chain
66
# and the `firstPartyDependencies` list in `buildSrc`.
7-
kotlin_version=2.1.20
7+
kotlin_version=2.2.0
88
atomicfu_version=0.26.1
99

1010
# Dependencies

integration-testing/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=2.1.0
1+
kotlin_version=2.2.0
22
coroutines_version=1.10.2-SNAPSHOT
33
asm_version=9.3
44
junit5_version=5.7.0

integration-testing/smokeTest/build.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,3 @@ kotlin {
7979
}
8080
}
8181
}
82-
83-
// Drop this configuration when the Node.JS version in KGP will support wasm gc milestone 4
84-
// check it here:
85-
// https://github.com/JetBrains/kotlin/blob/master/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
86-
rootProject.extensions.findByType(NodeJsRootExtension::class.java)?.apply {
87-
nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
88-
nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
89-
}

kotlinx-coroutines-core/common/src/flow/StateFlow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private class StateFlowSlot : AbstractSharedFlowSlot<StateFlowImpl<*>>() {
258258
* ===
259259
* This should be `atomic<Any?>(null)` instead of the atomic reference, but because of #3820
260260
* it is used as a **temporary** solution starting from 1.8.1 version.
261-
* Depending on the fix rollout on Android, it will be removed in 1.9.0 or 2.0.0.
261+
* Depending on the fix rollout on Android, it will be removed in 1.9.0 or 1.10.0.
262262
* See https://issuetracker.google.com/issues/325123736
263263
*/
264264
private val _state = WorkaroundAtomicReference<Any?>(null)
Binary file not shown.

reactive/kotlinx-coroutines-reactive/src/Publish.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ public class PublisherCoroutine<in T>(
316316
signalCompleted(cause, handled)
317317
}
318318

319-
@Suppress("OVERRIDE_DEPRECATION") // Remove after 2.2.0
320319
override fun cancel() {
321320
// Specification requires that after cancellation publisher stops signalling
322321
// This flag distinguishes subscription cancellation request from the job crash

0 commit comments

Comments
 (0)