Skip to content

Commit e69bc2c

Browse files
qwwdfsadqwwdfsad
authored
Kotlin 1.9.20 update followup (#3926)
* Do not conditionally enable K/N deprecated targets * Get rid of redundant suppresses that are not relevant to 1.9.20 Fixes #3828 Fixes #3846
1 parent b2ef7ab commit e69bc2c

File tree

10 files changed

+4
-101
lines changed

10 files changed

+4
-101
lines changed

‎gradle/compile-native-multiplatform.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ import static KotlinVersion.isKotlinVersionAtLeast
77
project.ext.nativeMainSets = []
88
project.ext.nativeTestSets = []
99

10-
// TODO: this block should be removed when Kotlin version is updated to 1.9.20
11-
// Right now it is used for conditional removal of native targets that will be removed in 1.9.20 (iosArm32, watchosX86)
12-
// and is necessary for testing of Kotlin dev builds.
13-
def enableDeprecatedNativeTargets = !isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 20)
14-
1510
kotlin {
1611
targets {
1712
delegate.metaClass.addTarget = { preset ->
@@ -48,12 +43,6 @@ kotlin {
4843
addTarget(presets.androidNativeX64)
4944
addTarget(presets.mingwX64)
5045
addTarget(presets.watchosDeviceArm64)
51-
52-
// Deprecated, but were provided by coroutine; can be removed only when K/N drops the target
53-
if (enableDeprecatedNativeTargets) {
54-
addTarget(presets.iosArm32)
55-
addTarget(presets.watchosX86)
56-
}
5746
}
5847

5948
sourceSets {

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,12 @@ package kotlinx.coroutines
66

77
import kotlinx.coroutines.internal.*
88

9-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
10-
// New 'CompletionHandler` supertype is added compared to the expect declaration.
11-
// Probably we can add it to JS and common too, to avoid the suppression/opt-in
12-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
139
internal actual abstract class CompletionHandlerBase actual constructor() : LockFreeLinkedListNode(), CompletionHandler {
1410
actual abstract override fun invoke(cause: Throwable?)
1511
}
1612

1713
internal actual inline val CompletionHandlerBase.asHandler: CompletionHandler get() = this
1814

19-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
20-
// New 'CompletionHandler` supertype is added compared to the expect declaration.
21-
// Probably we can add it to JS and common too, to avoid the suppression/opt-in
22-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
2315
internal actual abstract class CancelHandlerBase actual constructor() : CompletionHandler {
2416
actual abstract override fun invoke(cause: Throwable?)
2517
}

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

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ internal val CONDITION_FALSE: Any = Symbol("CONDITION_FALSE")
4242
*
4343
* @suppress **This is unstable API and it is subject to change.**
4444
*/
45-
@Suppress(
46-
"LeakingThis",
47-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
48-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING"
49-
)
45+
@Suppress("LeakingThis")
5046
@InternalCoroutinesApi
5147
public actual open class LockFreeLinkedListNode {
5248
private val _next = atomic<Any>(this) // Node | Removed | OpDescriptor
@@ -72,20 +68,14 @@ public actual open class LockFreeLinkedListNode {
7268
}
7369
}
7470

75-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
76-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
7771
@PublishedApi
7872
internal inline fun makeCondAddOp(node: Node, crossinline condition: () -> Boolean): CondAddOp =
7973
object : CondAddOp(node) {
8074
override fun prepare(affected: Node): Any? = if (condition()) null else CONDITION_FALSE
8175
}
8276

83-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
84-
@Suppress("MODALITY_CHANGED_IN_NON_FINAL_EXPECT_CLASSIFIER_ACTUALIZATION_WARNING")
8577
public actual open val isRemoved: Boolean get() = next is Removed
8678

87-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
88-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
8979
// LINEARIZABLE. Returns Node | Removed
9080
public val next: Any get() {
9181
_next.loop { next ->
@@ -176,8 +166,6 @@ public actual open class LockFreeLinkedListNode {
176166
* Where `==>` denotes linearization point.
177167
* Returns `false` if `next` was not following `this` node.
178168
*/
179-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
180-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
181169
@PublishedApi
182170
internal fun addNext(node: Node, next: Node): Boolean {
183171
node._prev.lazySet(this)
@@ -188,8 +176,6 @@ public actual open class LockFreeLinkedListNode {
188176
return true
189177
}
190178

191-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
192-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
193179
// returns UNDECIDED, SUCCESS or FAILURE
194180
@PublishedApi
195181
internal fun tryCondAddNext(node: Node, next: Node, condAdd: CondAddOp): Int {
@@ -213,8 +199,6 @@ public actual open class LockFreeLinkedListNode {
213199
public actual open fun remove(): Boolean =
214200
removeOrNext() == null
215201

216-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
217-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
218202
// returns null if removed successfully or next node if this node is already removed
219203
@PublishedApi
220204
internal fun removeOrNext(): Node? {
@@ -271,8 +255,6 @@ public actual open class LockFreeLinkedListNode {
271255
}
272256
}
273257

274-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
275-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
276258
protected open fun nextIfRemoved(): Node? = (next as? Removed)?.ref
277259

278260
/**
@@ -329,8 +311,6 @@ public actual open class LockFreeLinkedListNode {
329311
}
330312
}
331313

332-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
333-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
334314
internal fun validateNode(prev: Node, next: Node) {
335315
assert { prev === this._prev.value }
336316
assert { next === this._next.value }
@@ -351,8 +331,6 @@ internal fun Any.unwrap(): Node = (this as? Removed)?.ref ?: this as Node
351331
*
352332
* @suppress **This is unstable API and it is subject to change.**
353333
*/
354-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
355-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
356334
public actual open class LockFreeLinkedListHead : LockFreeLinkedListNode() {
357335
public actual val isEmpty: Boolean get() = next === this
358336

@@ -373,12 +351,8 @@ public actual open class LockFreeLinkedListHead : LockFreeLinkedListNode() {
373351
// optimization: because head is never removed, we don't have to read _next.value to check these:
374352
override val isRemoved: Boolean get() = false
375353

376-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
377-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION")
378354
override fun nextIfRemoved(): Node? = null
379355

380-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
381-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
382356
internal fun validate() {
383357
var prev: Node = this
384358
var cur: Node = next as Node

‎kotlinx-coroutines-core/js/src/internal/LinkedList.kt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@ package kotlinx.coroutines.internal
99
import kotlinx.coroutines.*
1010

1111
private typealias Node = LinkedListNode
12+
1213
/** @suppress **This is unstable API and it is subject to change.** */
13-
@Suppress(
14-
// :TODO: Remove when fixed: https://youtrack.jetbrains.com/issue/KT-23703
15-
"NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS",
16-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
17-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING",
18-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
19-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING"
20-
)
2114
public actual typealias LockFreeLinkedListNode = LinkedListNode
2215

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

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ import kotlinx.coroutines.Runnable
88
import kotlinx.coroutines.scheduling.*
99
import kotlinx.coroutines.scheduling.CoroutineScheduler
1010

11-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
12-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
1311
internal actual abstract class EventLoopImplPlatform: EventLoop() {
14-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
15-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
12+
1613
protected abstract val thread: Thread
1714

1815
protected actual fun unpark() {
@@ -21,8 +18,6 @@ internal actual abstract class EventLoopImplPlatform: EventLoop() {
2118
unpark(thread)
2219
}
2320

24-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
25-
@Suppress("MODALITY_CHANGED_IN_NON_FINAL_EXPECT_CLASSIFIER_ACTUALIZATION_WARNING")
2621
protected actual open fun reschedule(now: Long, delayedTask: EventLoopImplBase.DelayedTask) {
2722
DefaultExecutor.schedule(now, delayedTask)
2823
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ public abstract class ExecutorCoroutineDispatcher: CoroutineDispatcher(), Closea
3737
public abstract override fun close()
3838
}
3939

40-
@Suppress(
41-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
42-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING",
43-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
44-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_SUPERTYPES_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING"
45-
)
4640
@ExperimentalCoroutinesApi
4741
public actual typealias CloseableCoroutineDispatcher = ExecutorCoroutineDispatcher
4842

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ package kotlinx.coroutines
66

77
import kotlinx.coroutines.scheduling.*
88

9-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
10-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
119
internal actual typealias SchedulerTask = Task
1210

13-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
14-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
1511
internal actual typealias SchedulerTaskContext = TaskContext
1612

1713
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")

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

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ public actual typealias TestResult = Unit
5454
* }
5555
* ```
5656
*/
57-
@Suppress(
58-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
59-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING"
60-
)
6157
public actual open class TestBase(private var disableOutCheck: Boolean) {
6258

6359
actual constructor(): this(false)
@@ -83,13 +79,10 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
8379
* Throws [IllegalStateException] like `error` in stdlib, but also ensures that the test will not
8480
* complete successfully even if this exception is consumed somewhere in the test.
8581
*/
86-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
8782
public actual fun error(message: Any, cause: Throwable?): Nothing {
8883
throw makeError(message, cause)
8984
}
9085

91-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
92-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
9386
public fun hasError() = error.get() != null
9487

9588
private fun makeError(message: Any, cause: Throwable? = null): IllegalStateException =
@@ -113,8 +106,6 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
113106
* Throws [IllegalStateException] when `value` is false like `check` in stdlib, but also ensures that the
114107
* test will not complete successfully even if this exception is consumed somewhere in the test.
115108
*/
116-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
117-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
118109
public inline fun check(value: Boolean, lazyMessage: () -> Any) {
119110
if (!value) error(lazyMessage())
120111
}
@@ -162,16 +153,12 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
162153
}
163154
})
164155

165-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
166-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
167156
fun println(message: Any?) {
168157
if (disableOutCheck) kotlin.io.println(message)
169158
else previousOut.println(message)
170159
}
171160

172161
@Before
173-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
174-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
175162
fun before() {
176163
initPoolsBeforeTest()
177164
threadsBefore = currentThreads()
@@ -187,8 +174,6 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
187174
}
188175
}
189176

190-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
191-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
192177
@After
193178
fun onCompletion() {
194179
// onCompletion should not throw exceptions before it finishes all cleanup, so that other tests always
@@ -216,22 +201,17 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
216201
error.get()?.let { throw it }
217202
}
218203

219-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
220-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
221204
fun initPoolsBeforeTest() {
222205
DefaultScheduler.usePrivateScheduler()
223206
}
224207

225-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
226-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
227208
fun shutdownPoolsAfterTest() {
228209
DefaultScheduler.shutdown(SHUTDOWN_TIMEOUT)
229210
DefaultExecutor.shutdownForTests(SHUTDOWN_TIMEOUT)
230211
DefaultScheduler.restore()
231212
}
232213

233-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
234-
@Suppress("ACTUAL_WITHOUT_EXPECT", "ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
214+
@Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
235215
public actual fun runTest(
236216
expected: ((Throwable) -> Boolean)? = null,
237217
unhandled: List<(Throwable) -> Boolean> = emptyList(),
@@ -265,16 +245,12 @@ public actual open class TestBase(private var disableOutCheck: Boolean) {
265245
error("Too few unhandled exceptions $exCount, expected ${unhandled.size}")
266246
}
267247

268-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
269-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
270248
protected inline fun <reified T: Throwable> assertFailsWith(block: () -> Unit): T {
271249
val result = runCatching(block)
272250
assertTrue(result.exceptionOrNull() is T, "Expected ${T::class}, but had $result")
273251
return result.exceptionOrNull()!! as T
274252
}
275253

276-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
277-
@Suppress("NON_ACTUAL_MEMBER_DECLARED_IN_EXPECT_NON_FINAL_CLASSIFIER_ACTUALIZATION_WARNING")
278254
protected suspend fun currentDispatcher() = coroutineContext[ContinuationInterceptor]!!
279255
}
280256

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import kotlinx.atomicfu.locks.withLock as withLock2
1111
* @suppress **This an internal API and should not be used from general code.**
1212
*/
1313
@InternalCoroutinesApi
14-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
15-
@Suppress("ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING")
1614
public actual typealias SynchronizedObject = kotlinx.atomicfu.locks.SynchronizedObject
1715

1816
/**

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ private object BlackHole {
2525
var sink = 1
2626
}
2727

28-
@Suppress(
29-
// fixme replace the suppress with AllowDifferentMembersInActual once stdlib is updated to 1.9.20 https://github.com/Kotlin/kotlinx.coroutines/issues/3846
30-
"ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEMBERS_AS_NON_FINAL_EXPECT_CLASSIFIER_WARNING",
31-
)
3228
internal actual typealias SuppressSupportingThrowable = SuppressSupportingThrowableImpl
3329

3430
actual val Throwable.suppressed: Array<Throwable>

0 commit comments

Comments
 (0)