Skip to content

Commit

Permalink
Update Kotlin to 1.9.21 (#3954)
Browse files Browse the repository at this point in the history
* Update Kotlin to 1.9.21
* Update atomicfu to a version released with 1.9.21 to address KT-62515
* Enable K/N atomicfu transformations
  • Loading branch information
qwwdfsad committed Nov 27, 2023
1 parent 9b2bd3a commit e1342d2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
[![JetBrains official project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
[![Download](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.7.2)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.7.2)
[![Kotlin](https://img.shields.io/badge/kotlin-1.9.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/)

Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
This is a companion version for the Kotlin `1.9.20` release.
This is a companion version for the Kotlin `1.9.21` release.

```kotlin
suspend fun main() = coroutineScope {
Expand Down Expand Up @@ -93,7 +93,7 @@ And make sure that you use the latest Kotlin version:

```xml
<properties>
<kotlin.version>1.9.20</kotlin.version>
<kotlin.version>1.9.21</kotlin.version>
</properties>
```

Expand All @@ -112,10 +112,10 @@ And make sure that you use the latest Kotlin version:
```kotlin
plugins {
// For build.gradle.kts (Kotlin DSL)
kotlin("jvm") version "1.9.20"
kotlin("jvm") version "1.9.21"

// For build.gradle (Groovy DSL)
id "org.jetbrains.kotlin.jvm" version "1.9.20"
id "org.jetbrains.kotlin.jvm" version "1.9.21"
}
```

Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
# Kotlin
version=1.7.2-SNAPSHOT
group=org.jetbrains.kotlinx
kotlin_version=1.9.20
kotlin_version=1.9.21

# Dependencies
junit_version=4.12
junit5_version=5.7.0
atomicfu_version=0.22.0
atomicfu_version=0.23.1
knit_version=0.4.0
html_version=0.7.2
lincheck_version=2.18.1
Expand Down Expand Up @@ -46,3 +46,4 @@ kotlinx.atomicfu.enableJvmIrTransformation=true
# When the flag below is set to `true`, AtomicFU cannot process
# usages of `moveForward` in `ConcurrentLinkedList.kt` correctly.
kotlinx.atomicfu.enableJsIrTransformation=false
kotlinx.atomicfu.enableNativeIrTransformation=true
2 changes: 1 addition & 1 deletion integration-testing/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin_version=1.9.20
kotlin_version=1.9.21
coroutines_version=1.7.2-SNAPSHOT
asm_version=9.3

Expand Down
4 changes: 2 additions & 2 deletions kotlinx-coroutines-core/native/test/TestBase.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public actual typealias TestResult = Unit

public actual open class TestBase actual constructor() {
public actual val isBoundByJsTestTimeout = false
private var actionIndex = atomic(0)
private var finished = atomic(false)
private val actionIndex = atomic(0)
private val finished = atomic(false)
private var error: Throwable? = null

/**
Expand Down

0 comments on commit e1342d2

Please sign in to comment.