diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index b1bc9b82db0..f14d4e186c4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -730,8 +730,8 @@ class NewMultiplatformIT : BaseGradleIT() { // languageVersion = '1.3' // can't do this with Kotlin/Native 1.4+, done below for non-Native tasks // apiVersion = '1.3' // can't do this with Kotlin/Native 1.4+, done below for non-Native tasks enableLanguageFeature('InlineClasses') - useExperimentalAnnotation('kotlin.ExperimentalUnsignedTypes') - useExperimentalAnnotation('kotlin.contracts.ExperimentalContracts') + optInAnnotation('kotlin.ExperimentalUnsignedTypes') + optInAnnotation('kotlin.contracts.ExperimentalContracts') progressiveMode = true } project.ext.set("kotlin.mpp.freeCompilerArgsForSourceSet.${'$'}name", ["-Xno-inline"]) @@ -824,8 +824,8 @@ class NewMultiplatformIT : BaseGradleIT() { ) testMonotonousCheck( - "languageSettings.useExperimentalAnnotation('kotlin.ExperimentalUnsignedTypes')", - "The dependent source set must use all experimental annotations that its dependency uses." + "languageSettings.optInAnnotation('kotlin.ExperimentalUnsignedTypes')", + "The dependent source set must use all opt-in annotations that its dependency uses." ) // check that enabling a bugfix feature and progressive mode or advancing API level diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/build.gradle.kts index e6cf9c1c3d7..5fea77785fe 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/build.gradle.kts @@ -21,7 +21,7 @@ kotlin { targetBMain.dependsOn(nativeMain) sourceSets.all { - languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") + languageSettings.optInAnnotation("kotlin.RequiresOptIn") } targetA.compilations.getByName("main").cinterops.create("curl") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts index a0bfc34e7e0..cab4a00aa1e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchically/p1/build.gradle.kts @@ -75,7 +75,7 @@ kotlin { sourceSets.all { - languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") + languageSettings.optInAnnotation("kotlin.RequiresOptIn") } targets.withType().forEach { target -> diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p1/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p1/build.gradle.kts index 6252242da0c..3485ae5faed 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p1/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p1/build.gradle.kts @@ -68,7 +68,7 @@ kotlin { sourceSets.all { - languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") + languageSettings.optInAnnotation("kotlin.RequiresOptIn") } targets.withType().forEach { target -> diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p2/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p2/build.gradle.kts index daa84d98dfa..92a6df91a3d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p2/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p2/build.gradle.kts @@ -71,7 +71,7 @@ kotlin { } sourceSets.all { - languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") + languageSettings.optInAnnotation("kotlin.RequiresOptIn") } targets.withType().forEach { target -> diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p3/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p3/build.gradle.kts index 3553dae2270..3966756c887 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p3/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeHierarchicallyMultiModule/p3/build.gradle.kts @@ -67,7 +67,7 @@ kotlin { } sourceSets.all { - languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") + languageSettings.optInAnnotation("kotlin.RequiresOptIn") } targets.withType().forEach { target -> diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/build.gradle.kts index 953688b74bd..55c9813f9aa 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeInteropUsingPosixApis/build.gradle.kts @@ -22,7 +22,7 @@ kotlin { targetBMain.dependsOn(nativeMain) sourceSets.all { - languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") + languageSettings.optInAnnotation("kotlin.RequiresOptIn") } targetA.compilations.getByName("main").cinterops.create("withPosix") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/build.gradle.kts index bab129da953..789b6296f72 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteAndCurlInterop/build.gradle.kts @@ -21,7 +21,7 @@ kotlin { targetBMain.dependsOn(nativeMain) sourceSets.all { - languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") + languageSettings.optInAnnotation("kotlin.RequiresOptIn") } targetA.compilations.getByName("main").cinterops.create("sqlite") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteInterop/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteInterop/build.gradle.kts index cabe4ca8fa3..dfab479e29c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteInterop/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeSQLiteInterop/build.gradle.kts @@ -21,7 +21,7 @@ kotlin { targetBMain.dependsOn(nativeMain) sourceSets.all { - languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") + languageSettings.optInAnnotation("kotlin.RequiresOptIn") } targetA.compilations.getByName("main").cinterops.create("sqlite")