From ad90c86abe30d52e105de8efa2c2c0a1888e02c5 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Mon, 21 Aug 2023 11:06:16 +0200 Subject: [PATCH] jvm-minimal-for-test: apply module-wise -opt-in=kotlin.ExperimentalMultiplatform Motivation: Consistency. All other stdlib modules use this module-wise `-opt-in` --- libraries/stdlib/jvm-minimal-for-test/build.gradle.kts | 3 ++- libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt | 1 - libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts index 055bb458ae1..d8c26f5e9d3 100644 --- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts @@ -65,7 +65,8 @@ tasks.compileKotlin { "-Xallow-kotlin-package", "-Xmulti-platform", "-opt-in=kotlin.RequiresOptIn", - "-opt-in=kotlin.contracts.ExperimentalContracts" + "-opt-in=kotlin.contracts.ExperimentalContracts", + "-opt-in=kotlin.ExperimentalMultiplatform", ) moduleName = "kotlin-stdlib" } diff --git a/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt b/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt index 24c57b92e8a..e40b6783baf 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt @@ -28,6 +28,5 @@ package kotlin @Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS") @SinceKotlin("1.3") public actual typealias ConcurrentModificationException = java.util.ConcurrentModificationException -@OptIn(ExperimentalMultiplatform::class) @AllowDifferentMembersInActual // New 'reversed', 'thenComparing', etc. members are added compared to the expect declaration @SinceKotlin("1.1") public actual typealias Comparator = java.util.Comparator diff --git a/libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt b/libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt index 79ae2d6bed4..e26ceb0730b 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt @@ -7,7 +7,6 @@ package kotlin.text -@OptIn(ExperimentalMultiplatform::class) @AllowDifferentMembersInActual // New 'append' members are added compared to the expect declaration @SinceKotlin("1.1") public actual typealias Appendable = java.lang.Appendable