From b93bd1fe09b809bb0b399b172a42c24b8e7036de Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Mon, 19 Jul 2021 15:02:40 +0300 Subject: [PATCH] [Gradle] Simplify optInAnnotation function name to optIn in DSL #KT-38111 --- .../kotlin/gradle/plugin/LanguageSettingsBuilder.kt | 4 ++-- .../org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt | 6 +++--- .../testProject/commonizeCurlInterop/build.gradle.kts | 2 +- .../commonizeHierarchically/p1/build.gradle.kts | 2 +- .../p1/build.gradle.kts | 2 +- .../p2/build.gradle.kts | 2 +- .../p3/build.gradle.kts | 2 +- .../commonizeInteropUsingPosixApis/build.gradle.kts | 2 +- .../commonizeSQLiteAndCurlInterop/build.gradle.kts | 2 +- .../testProject/commonizeSQLiteInterop/build.gradle.kts | 2 +- .../plugin/sources/DefaultLanguageSettingsBuilder.kt | 8 ++++---- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt index 6d388e6a9d6..a95106a6be1 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt @@ -18,10 +18,10 @@ interface LanguageSettingsBuilder : LanguageSettings { override val enabledLanguageFeatures: Set - @Deprecated("Unsupported and will be removed in next major releases", replaceWith = ReplaceWith("optInAnnotation(name)")) + @Deprecated("Unsupported and will be removed in next major releases", replaceWith = ReplaceWith("optIn(name)")) fun useExperimentalAnnotation(name: String) - fun optInAnnotation(name: String) + fun optIn(annotationName: String) override val experimentalAnnotationsInUse: Set } \ No newline at end of file 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 686718716e5..1bbed110db6 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.4' // apiVersion = '1.4' enableLanguageFeature('InlineClasses') - optInAnnotation('kotlin.ExperimentalUnsignedTypes') - optInAnnotation('kotlin.contracts.ExperimentalContracts') + optIn('kotlin.ExperimentalUnsignedTypes') + optIn('kotlin.contracts.ExperimentalContracts') progressiveMode = true } project.ext.set("kotlin.mpp.freeCompilerArgsForSourceSet.${'$'}name", ["-Xno-inline"]) @@ -824,7 +824,7 @@ class NewMultiplatformIT : BaseGradleIT() { ) testMonotonousCheck( - "languageSettings.optInAnnotation('kotlin.ExperimentalUnsignedTypes')", + "languageSettings.optIn('kotlin.ExperimentalUnsignedTypes')", "The dependent source set must use all opt-in annotations that its dependency uses." ) 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 5fea77785fe..b226c7f394b 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.optInAnnotation("kotlin.RequiresOptIn") + languageSettings.optIn("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 cab4a00aa1e..3ad55a91914 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.optInAnnotation("kotlin.RequiresOptIn") + languageSettings.optIn("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 3485ae5faed..6cef2512b8f 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.optInAnnotation("kotlin.RequiresOptIn") + languageSettings.optIn("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 92a6df91a3d..e356f6f4a04 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.optInAnnotation("kotlin.RequiresOptIn") + languageSettings.optIn("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 3966756c887..9a3f0015a3d 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.optInAnnotation("kotlin.RequiresOptIn") + languageSettings.optIn("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 55c9813f9aa..0d92ddea753 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.optInAnnotation("kotlin.RequiresOptIn") + languageSettings.optIn("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 789b6296f72..f88ffa3dcc6 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.optInAnnotation("kotlin.RequiresOptIn") + languageSettings.optIn("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 dfab479e29c..61fc53d56d1 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.optInAnnotation("kotlin.RequiresOptIn") + languageSettings.optIn("kotlin.RequiresOptIn") } targetA.compilations.getByName("main").cinterops.create("sqlite") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt index d0510c8e367..fd8abf40bb5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt @@ -77,8 +77,8 @@ internal class DefaultLanguageSettingsBuilder(@Transient private val project: Pr return optInAnnotationsInUse } - override fun optInAnnotation(name: String) { - optInAnnotationsInUseImpl += name + override fun optIn(annotationName: String) { + optInAnnotationsInUseImpl += annotationName } override fun useExperimentalAnnotation(name: String) { @@ -86,9 +86,9 @@ internal class DefaultLanguageSettingsBuilder(@Transient private val project: Pr project, "Kotlin language settings function", "useExperimentalAnnotation", - "optInAnnotation" + "optIn" ) - optInAnnotation(name) + optIn(name) } /* A Kotlin task that is responsible for code analysis of the owner of this language settings builder. */