From dc3f3ce80de38f3e828eea1719635d3d0aaa46ed Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 28 Oct 2019 13:22:58 +0300 Subject: [PATCH] [Gradle, JS] Rename experimental annotation with warning level --- .../js/dsl/{ExperimentalDce.kt => ExperimentalDceDsl.kt} | 4 ++-- .../kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt | 4 ++-- .../kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/{ExperimentalDce.kt => ExperimentalDceDsl.kt} (77%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/ExperimentalDce.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/ExperimentalDceDsl.kt similarity index 77% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/ExperimentalDce.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/ExperimentalDceDsl.kt index 6777e203473..46cb07e05f8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/ExperimentalDce.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/ExperimentalDceDsl.kt @@ -5,6 +5,6 @@ package org.jetbrains.kotlin.gradle.targets.js.dsl -@Experimental +@Experimental(level = Experimental.Level.WARNING) @Target(AnnotationTarget.FUNCTION) -annotation class ExperimentalDce \ No newline at end of file +annotation class ExperimentalDceDsl \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt index ce63b99cd21..a592afcec46 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt @@ -61,10 +61,10 @@ interface KotlinJsBrowserDsl : KotlinJsSubTargetDsl { } } - @ExperimentalDce + @ExperimentalDceDsl fun dceTask(body: KotlinJsDce.() -> Unit) - @ExperimentalDce + @ExperimentalDceDsl fun dceTask(fn: Closure<*>) { dceTask { ConfigureUtil.configure(fn, this) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index 37985a568c7..d511ad9921c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget import org.jetbrains.kotlin.gradle.targets.js.dsl.BuildVariant import org.jetbrains.kotlin.gradle.targets.js.dsl.BuildVariantKind -import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDce +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDceDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBrowserDsl import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject @@ -56,7 +56,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : commonWebpackConfigurations.add(body) } - @ExperimentalDce + @ExperimentalDceDsl override fun dceTask(body: KotlinJsDce.() -> Unit) { dceConfigurations.add(body) }