Skip to content

Commit bc29ef1

Browse files
committed
Update kotlin version to 1.9.20-RC2
1 parent 24b3553 commit bc29ef1

File tree

16 files changed

+8
-22
lines changed

16 files changed

+8
-22
lines changed

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
# Kotlin
66
version=1.7.2-SNAPSHOT
77
group=org.jetbrains.kotlinx
8-
kotlin_version=1.9.20-Beta2
8+
kotlin_version=1.9.20-RC2
99

1010
# Dependencies
1111
junit_version=4.12
1212
junit5_version=5.7.0
1313
# TODO: Update version as regular atomic-fu will be published
14-
atomicfu_version=0.22.0-wasm1
14+
atomicfu_version=0.22.0-wasm2
1515
knit_version=0.4.0
1616
html_version=0.7.2
1717
lincheck_version=2.18.1

integration-testing/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=1.9.20-Beta2
1+
kotlin_version=1.9.20-RC2
22
coroutines_version=1.7.2-SNAPSHOT
33
asm_version=9.3
44

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

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import kotlinx.coroutines.internal.*
88

99
// New 'CompletionHandler` supertype is added compared to the expect declaration.
1010
// Probably we can add it to JS and common too, to avoid the suppression/opt-in
11-
@AllowDifferentMembersInActual
1211
internal actual abstract class CompletionHandlerBase actual constructor() : LockFreeLinkedListNode(), CompletionHandler {
1312
actual abstract override fun invoke(cause: Throwable?)
1413
}
@@ -17,7 +16,6 @@ internal actual inline val CompletionHandlerBase.asHandler: CompletionHandler ge
1716

1817
// New 'CompletionHandler` supertype is added compared to the expect declaration.
1918
// Probably we can add it to JS and common too, to avoid the suppression/opt-in
20-
@AllowDifferentMembersInActual
2119
internal actual abstract class CancelHandlerBase actual constructor() : CompletionHandler {
2220
actual abstract override fun invoke(cause: Throwable?)
2321
}

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ internal val CONDITION_FALSE: Any = Symbol("CONDITION_FALSE")
4646
"LeakingThis",
4747
)
4848
@InternalCoroutinesApi
49-
@AllowDifferentMembersInActual
5049
public actual open class LockFreeLinkedListNode {
5150
private val _next = atomic<Any>(this) // Node | Removed | OpDescriptor
5251
private val _prev = atomic(this) // Node to the left (cannot be marked as removed)
@@ -56,8 +55,7 @@ public actual open class LockFreeLinkedListNode {
5655
_removedRef.value ?: Removed(this).also { _removedRef.lazySet(it) }
5756

5857
@PublishedApi
59-
@AllowDifferentMembersInActual
60-
internal abstract class CondAddOp(
58+
internal abstract class CondAddOp(
6159
@JvmField val newNode: Node
6260
) : AtomicOp<Node>() {
6361
@JvmField var oldNext: Node? = null
@@ -335,7 +333,6 @@ internal fun Any.unwrap(): Node = (this as? Removed)?.ref ?: this as Node
335333
*
336334
* @suppress **This is unstable API and it is subject to change.**
337335
*/
338-
@AllowDifferentMembersInActual
339336
public actual open class LockFreeLinkedListHead : LockFreeLinkedListNode() {
340337
public actual val isEmpty: Boolean get() = next === this
341338

kotlinx-coroutines-core/js/src/JSDispatcher.kt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package kotlinx.coroutines
77
import org.w3c.dom.*
88
import kotlin.js.Promise
99

10-
@AllowDifferentMembersInActual
1110
public actual typealias W3CWindow = Window
1211

1312
internal actual fun w3cSetTimeout(window: W3CWindow, handler: () -> Unit, timeout: Int): Int =

kotlinx-coroutines-core/jsAndWasmShared/src/internal/LinkedList.kt

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import kotlinx.coroutines.*
1010

1111
private typealias Node = LinkedListNode
1212
/** @suppress **This is unstable API and it is subject to change.** */
13-
@AllowDifferentMembersInActual
1413
public actual typealias LockFreeLinkedListNode = LinkedListNode
1514

1615
/** @suppress **This is unstable API and it is subject to change.** */

kotlinx-coroutines-core/jsAndWasmShared/src/internal/Synchronized.kt

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import kotlinx.coroutines.*
1010
* @suppress **This an internal API and should not be used from general code.**
1111
*/
1212
@InternalCoroutinesApi
13-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER")
1413
public actual typealias SynchronizedObject = Any
1514

1615
/**

kotlinx-coroutines-core/jvm/src/EventLoop.kt

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import kotlinx.coroutines.Runnable
88
import kotlinx.coroutines.scheduling.*
99
import kotlinx.coroutines.scheduling.CoroutineScheduler
1010

11-
@AllowDifferentMembersInActual
1211
internal actual abstract class EventLoopImplPlatform: EventLoop() {
1312
protected abstract val thread: Thread
1413

kotlinx-coroutines-core/jvm/src/Executors.kt

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public abstract class ExecutorCoroutineDispatcher: CoroutineDispatcher(), Closea
3838
}
3939

4040
@ExperimentalCoroutinesApi
41-
@AllowDifferentMembersInActual
4241
public actual typealias CloseableCoroutineDispatcher = ExecutorCoroutineDispatcher
4342

4443
/**

kotlinx-coroutines-core/jvm/src/SchedulerTask.kt

-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ package kotlinx.coroutines
66

77
import kotlinx.coroutines.scheduling.*
88

9-
@AllowDifferentMembersInActual
109
internal actual typealias SchedulerTask = Task
1110

12-
@AllowDifferentMembersInActual
1311
internal actual typealias SchedulerTaskContext = TaskContext
1412

1513
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")

kotlinx-coroutines-core/jvm/test/TestBase.kt

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public actual typealias TestResult = Unit
5454
* }
5555
* ```
5656
*/
57-
@AllowDifferentMembersInActual
5857
public actual open class TestBase(private var disableOutCheck: Boolean) {
5958

6059
actual constructor(): this(false)

kotlinx-coroutines-core/native/src/internal/Concurrent.kt

+2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
package kotlinx.coroutines.internal
66

77
import kotlinx.atomicfu.*
8+
import kotlinx.cinterop.*
89
import kotlinx.atomicfu.locks.withLock as withLock2
910

1011
@Suppress("ACTUAL_WITHOUT_EXPECT")
1112
internal actual typealias ReentrantLock = kotlinx.atomicfu.locks.SynchronizedObject
1213

14+
@OptIn(UnsafeNumber::class)
1315
internal actual inline fun <T> ReentrantLock.withLock(action: () -> T): T = this.withLock2(action)
1416

1517
internal actual fun <E> identitySet(expectedSize: Int): MutableSet<E> = HashSet()

kotlinx-coroutines-core/native/src/internal/Synchronized.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
44

55
package kotlinx.coroutines.internal
66

7+
import kotlinx.cinterop.*
78
import kotlinx.coroutines.*
89
import kotlinx.atomicfu.locks.withLock as withLock2
910

1011
/**
1112
* @suppress **This an internal API and should not be used from general code.**
1213
*/
1314
@InternalCoroutinesApi
14-
@AllowDifferentMembersInActual
1515
public actual typealias SynchronizedObject = kotlinx.atomicfu.locks.SynchronizedObject
1616

1717
/**
1818
* @suppress **This an internal API and should not be used from general code.**
1919
*/
20+
@OptIn(UnsafeNumber::class)
2021
@InternalCoroutinesApi
2122
public actual inline fun <T> synchronizedImpl(lock: SynchronizedObject, block: () -> T): T = lock.withLock2(block)

kotlinx-coroutines-core/native/test/ConcurrentTestUtilities.kt

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ private object BlackHole {
2525
var sink = 1
2626
}
2727

28-
@AllowDifferentMembersInActual
2928
internal actual typealias SuppressSupportingThrowable = SuppressSupportingThrowableImpl
3029

3130
actual val Throwable.suppressed: Array<Throwable>

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

-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ package kotlinx.coroutines
66

77
import kotlinx.coroutines.internal.*
88

9-
@AllowDifferentMembersInActual
109
internal actual abstract class CompletionHandlerBase actual constructor() : LockFreeLinkedListNode(), CompletionHandler {
1110
actual abstract override fun invoke(cause: Throwable?)
1211
}
1312

1413
internal actual inline val CompletionHandlerBase.asHandler: CompletionHandler get() = this
1514

16-
@AllowDifferentMembersInActual
1715
internal actual abstract class CancelHandlerBase actual constructor() : CompletionHandler {
1816
actual abstract override fun invoke(cause: Throwable?)
1917
}

kotlinx-coroutines-core/wasmJs/src/JSDispatcher.kt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package kotlinx.coroutines
77
import org.w3c.dom.Window
88
import kotlin.js.*
99

10-
@AllowDifferentMembersInActual
1110
public actual typealias W3CWindow = Window
1211

1312
internal actual fun w3cSetTimeout(window: W3CWindow, handler: () -> Unit, timeout: Int): Int =

0 commit comments

Comments
 (0)