Update kotlin version to 1.9.20-Beta

Author: igoriakovlev

build.gradle

@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 
-import static KotlinVersion.isKotlinVersionAtLeast
 import static Projects.*
 
 apply plugin: 'jdk-convention'
@@ -62,7 +61,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
-        classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_wasm_version"
+        classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_version"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version"
         classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$binary_compatibility_validator_version"
         classpath "ru.vyarus:gradle-animalsniffer-plugin:1.5.4" // Android API check
@@ -164,14 +163,7 @@ configure(subprojects.findAll { !sourceless.contains(it.name) && it.name != core
 
         apply from: rootProject.file("gradle/compile-js-multiplatform.gradle")
 
-        // TODO: Wasm target names have been changed since 1.9.20, remove this after migration to 1.9.20 (issue 3846)
-        // https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-        def isNewWasmTargetEnabled = isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 20)
-        if (isNewWasmTargetEnabled) {
-            apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")
-        } else {
-            apply from: rootProject.file("gradle/compile-wasm-multiplatform19.gradle")
-        }
+        apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")
 
         kotlin.sourceSets.commonMain.dependencies {
             api project(":$coreModule")
@@ -384,17 +376,6 @@ if (CacheRedirector.enabled) {
     }
 }
 
-// This is bootstrap atomicFU version with wasm support, remove it as regular atomic-fu will be published
-allprojects {
-    configurations.all {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            if (details.requested.name == 'atomicfu-wasm') {
-                details.useVersion atomicfu_wasm_version
-            }
-        }
-    }
-}
-
 // Update node version to support latest wasm engine
 extensions.findByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.class).with {
     it.nodeVersion = "20.2.0"

buildSrc/src/main/kotlin/KotlinVersion.kt

@@ -5,14 +5,13 @@
 # Kotlin
 version=1.7.2-SNAPSHOT
 group=org.jetbrains.kotlinx
-kotlin_version=1.9.0
+kotlin_version=1.9.20-Beta
 
 # Dependencies
 junit_version=4.12
 junit5_version=5.7.0
-atomicfu_version=0.22.0
-# This is bootstrap atomicFU version with wasm support, remove it as regular atomic-fu will be published
-atomicfu_wasm_version=0.21.0-wasm0
+# TODO: Update version as regular atomic-fu will be published
+atomicfu_version=0.22.0-wasm1
 knit_version=0.4.0
 html_version=0.7.2
 lincheck_version=2.18.1

gradle.properties

@@ -1,17 +1,10 @@
-import static KotlinVersion.isKotlinVersionAtLeast
-
 /*
  * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 project.ext.nativeMainSets = []
 project.ext.nativeTestSets = []
 
-// TODO: this block should be removed when Kotlin version is updated to 1.9.20
-// Right now it is used for conditional removal of native targets that will be removed in 1.9.20 (iosArm32, watchosX86)
-// and is necessary for testing of Kotlin dev builds.
-def enableDeprecatedNativeTargets = !isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 20)
-
 kotlin {
     targets {
         delegate.metaClass.addTarget = { preset ->
@@ -48,12 +41,6 @@ kotlin {
         addTarget(presets.androidNativeX64)
         addTarget(presets.mingwX64)
         addTarget(presets.watchosDeviceArm64)
-
-        // Deprecated, but were provided by coroutine; can be removed only when K/N drops the target
-        if (enableDeprecatedNativeTargets) {
-            addTarget(presets.iosArm32)
-            addTarget(presets.watchosX86)
-        }
     }
 
     sourceSets {

gradle/compile-native-multiplatform.gradle

@@ -15,13 +15,11 @@ kotlin {
         wasmJsMain {
             kotlin {
                 srcDir 'jsAndWasmShared/src'
-                srcDir 'wasmJs/src'
             }
         }
         wasmJsTest {
             kotlin {
                 srcDir 'jsAndWasmShared/test'
-                srcDir 'wasmJs/test'
             }
         }
         wasmJsTest.dependencies {

gradle/compile-wasm-multiplatform.gradle

@@ -67,15 +67,8 @@ if (project.name == "kotlinx-coroutines-core") {
                 makeLinkMapping(project.file("jvm"))
             }
 
-            val isNewWasmTargetEnabled = isKotlinVersionAtLeast(kotlin_version, 1, 9, 20)
-            if (isNewWasmTargetEnabled) {
-                val wasmJsMain by getting {
-                    makeLinkMapping(project.file("wasm"))
-                }
-            } else {
-                val wasmMain by getting {
-                    makeLinkMapping(project.file("wasm"))
-                }
+            val wasmJsMain by getting {
+                makeLinkMapping(project.file("wasm"))
             }
         }
     }

gradle/compile-wasm-multiplatform19.gradle

@@ -1,4 +1,4 @@
-kotlin_version=1.9.0
+kotlin_version=1.9.20-Beta
 coroutines_version=1.7.2-SNAPSHOT
 asm_version=9.3
 

gradle/dokka.gradle.kts

@@ -60,17 +60,6 @@ kotlin {
     }
 }
 
-// This is bootstrap atomicFU version with wasm support, remove it as regular atomic-fu will be published
-allprojects {
-    configurations.all {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            if (details.requested.name == 'atomicfu-wasm') {
-                details.useVersion '0.21.0-wasm0'
-            }
-        }
-    }
-}
-
 // Update node version to support latest wasm engine
 rootProject.extensions.findByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.class).with {
     it.nodeVersion = "20.2.0"

integration-testing/gradle.properties

@@ -1,6 +1,3 @@
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
-import static KotlinVersion.isKotlinVersionAtLeast
-
 /*
  * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
@@ -20,14 +17,7 @@ if (rootProject.ext.native_targets_enabled) {
 
 apply from: rootProject.file("gradle/compile-js-multiplatform.gradle")
 
-// TODO: Wasm target names have been changed since 1.9.20, remove this after migration to 1.9.20 (issue 3846)
-// https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-def isNewWasmTargetEnabled = isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 20)
-if (isNewWasmTargetEnabled) {
-    apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")
-} else {
-    apply from: rootProject.file("gradle/compile-wasm-multiplatform19.gradle")
-}
+apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")
 
 apply from: rootProject.file('gradle/dokka.gradle.kts')
 apply from: rootProject.file('gradle/publish.gradle')

integration-testing/smokeTest/build.gradle

@@ -6,20 +6,18 @@ package kotlinx.coroutines
 
 import kotlinx.coroutines.internal.*
 
-// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
 // New 'CompletionHandler` supertype is added compared to the expect declaration.
 // Probably we can add it to JS and common too, to avoid the suppression/opt-in
-@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER")
+@AllowDifferentMembersInActual
 internal actual abstract class CompletionHandlerBase actual constructor() : LockFreeLinkedListNode(), CompletionHandler {
     actual abstract override fun invoke(cause: Throwable?)
 }
 
 internal actual inline val CompletionHandlerBase.asHandler: CompletionHandler get() = this
 
-// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
 // New 'CompletionHandler` supertype is added compared to the expect declaration.
 // Probably we can add it to JS and common too, to avoid the suppression/opt-in
-@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER")
+@AllowDifferentMembersInActual
 internal actual abstract class CancelHandlerBase actual constructor() : CompletionHandler {
     actual abstract override fun invoke(cause: Throwable?)
 }

kotlinx-coroutines-core/build.gradle

@@ -44,10 +44,9 @@ internal val CONDITION_FALSE: Any = Symbol("CONDITION_FALSE")
  */
 @Suppress(
     "LeakingThis",
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    "ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER"
 )
 @InternalCoroutinesApi
+@AllowDifferentMembersInActual
 public actual open class LockFreeLinkedListNode {
     private val _next = atomic<Any>(this) // Node | Removed | OpDescriptor
     private val _prev = atomic(this) // Node to the left (cannot be marked as removed)
@@ -57,6 +56,7 @@ public actual open class LockFreeLinkedListNode {
         _removedRef.value ?: Removed(this).also { _removedRef.lazySet(it) }
 
     @PublishedApi
+    @AllowDifferentMembersInActual
     internal abstract class CondAddOp(
         @JvmField val newNode: Node
     ) : AtomicOp<Node>() {
@@ -72,20 +72,14 @@ public actual open class LockFreeLinkedListNode {
         }
     }
 
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    @Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
     @PublishedApi
     internal inline fun makeCondAddOp(node: Node, crossinline condition: () -> Boolean): CondAddOp =
         object : CondAddOp(node) {
             override fun prepare(affected: Node): Any? = if (condition()) null else CONDITION_FALSE
         }
 
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    @Suppress("MODALITY_CHANGED_IN_NON_FINAL_EXPECT_CLASSIFIER_ACTUALIZATION")
     public actual open val isRemoved: Boolean get() = next is Removed
 
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    @Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
     // LINEARIZABLE. Returns Node | Removed
     public val next: Any get() {
         _next.loop { next ->
@@ -176,8 +170,6 @@ public actual open class LockFreeLinkedListNode {
      *  Where `==>` denotes linearization point.
      *  Returns `false` if `next` was not following `this` node.
      */
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    @Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
     @PublishedApi
     internal fun addNext(node: Node, next: Node): Boolean {
         node._prev.lazySet(this)
@@ -188,8 +180,6 @@ public actual open class LockFreeLinkedListNode {
         return true
     }
 
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    @Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
     // returns UNDECIDED, SUCCESS or FAILURE
     @PublishedApi
     internal fun tryCondAddNext(node: Node, next: Node, condAdd: CondAddOp): Int {
@@ -213,8 +203,6 @@ public actual open class LockFreeLinkedListNode {
     public actual open fun remove(): Boolean =
         removeOrNext() == null
 
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    @Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
     // returns null if removed successfully or next node if this node is already removed
     @PublishedApi
     internal fun removeOrNext(): Node? {
@@ -271,8 +259,6 @@ public actual open class LockFreeLinkedListNode {
         }
     }
 
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    @Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
     protected open fun nextIfRemoved(): Node? = (next as? Removed)?.ref
 
     /**
@@ -329,8 +315,6 @@ public actual open class LockFreeLinkedListNode {
         }
     }
 
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    @Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
     internal fun validateNode(prev: Node, next: Node) {
         assert { prev === this._prev.value }
         assert { next === this._next.value }
@@ -351,8 +335,7 @@ internal fun Any.unwrap(): Node = (this as? Removed)?.ref ?: this as Node
  *
  * @suppress **This is unstable API and it is subject to change.**
  */
-// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER")
+@AllowDifferentMembersInActual
 public actual open class LockFreeLinkedListHead : LockFreeLinkedListNode() {
     public actual val isEmpty: Boolean get() = next === this
 
@@ -374,8 +357,6 @@ public actual open class LockFreeLinkedListHead : LockFreeLinkedListNode() {
     override val isRemoved: Boolean get() = false
     override fun nextIfRemoved(): Node? = null
 
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    @Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
     internal fun validate() {
         var prev: Node = this
         var cur: Node = next as Node

kotlinx-coroutines-core/concurrent/src/CompletionHandler.kt

@@ -10,14 +10,7 @@ import kotlinx.coroutines.*
 
 private typealias Node = LinkedListNode
 /** @suppress **This is unstable API and it is subject to change.** */
-@Suppress(
-    // :TODO: Remove when fixed: https://youtrack.jetbrains.com/issue/KT-23703
-    "NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS",
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    "ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER",
-    // fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
-    "ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER"
-)
+@AllowDifferentMembersInActual
 public actual typealias LockFreeLinkedListNode = LinkedListNode
 
 /** @suppress **This is unstable API and it is subject to change.** */

kotlinx-coroutines-core/concurrent/src/internal/LockFreeLinkedList.kt

@@ -10,6 +10,7 @@ import kotlinx.coroutines.*
  * @suppress **This an internal API and should not be used from general code.**
  */
 @InternalCoroutinesApi
+@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER")
 public actual typealias SynchronizedObject = Any
 
 /**