Skip to content

Commit 845e322

Browse files
Update Kotlin to 1.7.10 (#3324)
Co-authored-by: mvicsokolova <[email protected]>
1 parent 81e17dd commit 845e322

File tree

9 files changed

+12
-21
lines changed

9 files changed

+12
-21
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
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.6.4)](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.6.4/pom)
7-
[![Kotlin](https://img.shields.io/badge/kotlin-1.6.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
7+
[![Kotlin](https://img.shields.io/badge/kotlin-1.7.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
88
[![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/)
99

1010
Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
11-
This is a companion version for the Kotlin `1.6.21` release.
11+
This is a companion version for the Kotlin `1.7.10` release.
1212

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

9393
```xml
9494
<properties>
95-
<kotlin.version>1.6.21</kotlin.version>
95+
<kotlin.version>1.7.10</kotlin.version>
9696
</properties>
9797
```
9898

@@ -111,10 +111,10 @@ And make sure that you use the latest Kotlin version:
111111
```kotlin
112112
plugins {
113113
// For build.gradle.kts (Kotlin DSL)
114-
kotlin("jvm") version "1.6.21"
114+
kotlin("jvm") version "1.7.10"
115115

116116
// For build.gradle (Groovy DSL)
117-
id "org.jetbrains.kotlin.jvm" version "1.6.21"
117+
id "org.jetbrains.kotlin.jvm" version "1.7.10"
118118
}
119119
```
120120

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ buildscript {
5858
classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$binary_compatibility_validator_version"
5959
classpath "ru.vyarus:gradle-animalsniffer-plugin:1.5.4" // Android API check
6060
classpath "org.jetbrains.kotlinx:kover:$kover_version"
61+
classpath "org.jetbrains.kotlin:atomicfu:$kotlin_version"
6162

6263
// JMH plugins
6364
classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"

gradle.properties

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

1010
# Dependencies
1111
junit_version=4.12
1212
junit5_version=5.7.0
13-
atomicfu_version=0.17.3
13+
atomicfu_version=0.18.2
1414
knit_version=0.4.0
1515
html_version=0.7.2
1616
lincheck_version=2.14

integration-testing/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
* Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5-
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
6-
75
plugins {
8-
id "org.jetbrains.kotlin.jvm"
6+
id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
97
}
108

119
repositories {

integration-testing/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=1.6.21
1+
kotlin_version=1.7.10
22
coroutines_version=1.6.4-SNAPSHOT
33

44
kotlin.code.style=official

integration-testing/settings.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
pluginManagement {
2-
resolutionStrategy {
3-
eachPlugin {
4-
if (requested.id.id == "org.jetbrains.kotlin.multiplatform" || requested.id.id == "org.jetbrains.kotlin.jvm") {
5-
useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
6-
}
7-
}
8-
}
9-
102
repositories {
113
mavenCentral()
124
maven { url "https://plugins.gradle.org/m2/" }

kotlinx-coroutines-core/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ tasks.koverVerify {
290290

291291
task testsJar(type: Jar, dependsOn: jvmTestClasses) {
292292
classifier = 'tests'
293-
from compileTestKotlinJvm.destinationDir
293+
from(compileTestKotlinJvm.destinationDirectory)
294294
}
295295

296296
artifacts {
Binary file not shown.

kotlinx-coroutines-core/jvm/test/internal/LockFreeLinkedListLongStressTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ class LockFreeLinkedListLongStressTest : TestBase() {
7070
}
7171
require(!expected.hasNext())
7272
}
73-
}
73+
}

0 commit comments

Comments
 (0)