Update Kotlin to 1.7.10 (Kotlin#3324)

Co-authored-by: mvicsokolova <[email protected]>
Earlycrusher · Jul 14, 2022 · 845e322 · 845e322
1 parent 81e17dd
commit 845e322
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -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.6.4)](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.6.4/pom)
-[![Kotlin](https://img.shields.io/badge/kotlin-1.6.21-blue.svg?logo=kotlin)](https://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.7.10-blue.svg?logo=kotlin)](https://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.6.21` release.
+This is a companion version for the Kotlin `1.7.10` release.
 
 ```kotlin
 suspend fun main() = coroutineScope {
@@ -92,7 +92,7 @@ And make sure that you use the latest Kotlin version:
 
 ```xml
 <properties>
- <kotlin.version>1.6.21</kotlin.version>
+ <kotlin.version>1.7.10</kotlin.version>
 </properties>
 ```
 
@@ -111,10 +111,10 @@ And make sure that you use the latest Kotlin version:
 ```kotlin
 plugins {
  // For build.gradle.kts (Kotlin DSL)
- kotlin("jvm") version "1.6.21"
+ kotlin("jvm") version "1.7.10"
 
  // For build.gradle (Groovy DSL)
- id "org.jetbrains.kotlin.jvm" version "1.6.21"
+ id "org.jetbrains.kotlin.jvm" version "1.7.10"
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -58,6 +58,7 @@ buildscript {
  classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$binary_compatibility_validator_version"
  classpath "ru.vyarus:gradle-animalsniffer-plugin:1.5.4" // Android API check
  classpath "org.jetbrains.kotlinx:kover:$kover_version"
+ classpath "org.jetbrains.kotlin:atomicfu:$kotlin_version"
 
  // JMH plugins
  classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"

diff --git a/gradle.properties b/gradle.properties
@@ -5,12 +5,12 @@
 # Kotlin
 version=1.6.4-SNAPSHOT
 group=org.jetbrains.kotlinx
-kotlin_version=1.6.21
+kotlin_version=1.7.10
 
 # Dependencies
 junit_version=4.12
 junit5_version=5.7.0
-atomicfu_version=0.17.3
+atomicfu_version=0.18.2
 knit_version=0.4.0
 html_version=0.7.2
 lincheck_version=2.14

diff --git a/integration-testing/build.gradle b/integration-testing/build.gradle
@@ -2,10 +2,8 @@
  * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
-
 plugins {
- id "org.jetbrains.kotlin.jvm"
+ id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
 }
 
 repositories {

diff --git a/integration-testing/gradle.properties b/integration-testing/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.6.21
+kotlin_version=1.7.10
 coroutines_version=1.6.4-SNAPSHOT
 
 kotlin.code.style=official
diff --git a/integration-testing/settings.gradle b/integration-testing/settings.gradle
@@ -1,12 +1,4 @@
 pluginManagement {
- resolutionStrategy {
- eachPlugin {
- if (requested.id.id == "org.jetbrains.kotlin.multiplatform" || requested.id.id == "org.jetbrains.kotlin.jvm") {
- useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
- }
- }
- }
-
  repositories {
  mavenCentral()
  maven { url "https://plugins.gradle.org/m2/" }

diff --git a/kotlinx-coroutines-core/build.gradle b/kotlinx-coroutines-core/build.gradle
@@ -290,7 +290,7 @@ tasks.koverVerify {
 
 task testsJar(type: Jar, dependsOn: jvmTestClasses) {
  classifier = 'tests'
- from compileTestKotlinJvm.destinationDir
+ from(compileTestKotlinJvm.destinationDirectory)
 }
 
 artifacts {

diff --git a/kotlinx-coroutines-core/jvm/resources/DebugProbesKt.bin b/kotlinx-coroutines-core/jvm/resources/DebugProbesKt.bin
diff --git a/kotlinx-coroutines-core/jvm/test/internal/LockFreeLinkedListLongStressTest.kt b/kotlinx-coroutines-core/jvm/test/internal/LockFreeLinkedListLongStressTest.kt
@@ -70,4 +70,4 @@ class LockFreeLinkedListLongStressTest : TestBase() {
  }
  require(!expected.hasNext())
  }
-}
+}