From 60cbfbf107c1be883ba5d627d99ca27fd4d7fdd9 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 27 Sep 2021 16:45:36 +0200 Subject: [PATCH] Change KotlinGradleSubplugin deprecation level to ERROR. ^KT-48830 Fixed --- .../src/main/kotlin/example/ExampleLegacySubplugin.kt | 2 +- .../org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt | 2 +- .../jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt | 3 ++- .../gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt | 2 +- .../jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt | 6 +++--- .../gradle/scripting/internal/ScriptingGradleSubplugin.kt | 2 +- .../gradle/targets/android/internal/AndroidSubplugin.kt | 2 +- .../org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt | 2 +- .../kotlin/noarg/gradle/SamWithReceiverSubplugin.kt | 2 +- .../kotlinx/serialization/gradle/SerializationSubplugin.kt | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleLegacySubplugin.kt b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleLegacySubplugin.kt index 5206b9172f7..b0026c059b0 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleLegacySubplugin.kt +++ b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleLegacySubplugin.kt @@ -20,7 +20,7 @@ import org.gradle.api.Project import org.gradle.api.tasks.compile.AbstractCompile import org.jetbrains.kotlin.gradle.plugin.* -class ExampleLegacySubplugin : @Suppress("DEPRECATION") KotlinGradleSubplugin { +class ExampleLegacySubplugin : @Suppress("DEPRECATION_ERROR") KotlinGradleSubplugin { override fun isApplicable(project: Project, task: AbstractCompile): Boolean { return true diff --git a/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt b/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt index 287fe184de2..a25f07b8563 100644 --- a/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt +++ b/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt @@ -29,7 +29,7 @@ import javax.inject.Inject class AllOpenGradleSubplugin @Inject internal constructor(private val registry: ToolingModelBuilderRegistry) : KotlinCompilerPluginSupportPlugin, - @Suppress("DEPRECATION") // implementing to fix KT-39809 + @Suppress("DEPRECATION_ERROR") // implementing to fix KT-39809 KotlinGradleSubplugin { companion object { diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt index 42bff7f5d5e..f073b70df6d 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt @@ -70,7 +70,8 @@ open class InternalSubpluginOption(key: String, value: String) : SubpluginOption message = "This interface will be removed due to performance considerations. " + "Please use the KotlinCompilerPluginSupportPlugin interface instead " + "and remove the META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin entry.", - replaceWith = ReplaceWith("KotlinCompilerPluginSupportPlugin") + replaceWith = ReplaceWith("KotlinCompilerPluginSupportPlugin"), + level = DeprecationLevel.ERROR ) interface KotlinGradleSubplugin { fun isApplicable(project: Project, task: AbstractCompile): Boolean diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt index 87ae6611ec3..437cd9ed639 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt @@ -839,7 +839,7 @@ private val BaseVariant.dataBindingDependencyArtifactsIfSupported: FileCollectio ?.invoke(this) as? FileCollection //region Stub implementation for legacy API, KT-39809 -@Suppress("DEPRECATION") // implementing to fix KT-39809 +@Suppress("DEPRECATION_ERROR") // implementing to fix KT-39809 class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin { override fun isApplicable(project: Project, task: AbstractCompile): Boolean = false diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt index 0e08ea99a58..18a29ec10a7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt @@ -27,7 +27,7 @@ class SubpluginEnvironment( fun loadSubplugins(project: Project): SubpluginEnvironment { val kotlinPluginVersion = project.getKotlinPluginVersion() return try { - @Suppress("DEPRECATION") // support for the deprecated plugin API + @Suppress("DEPRECATION_ERROR") // support for the deprecated plugin API val klass = KotlinGradleSubplugin::class.java val buildscriptClassloader = project.buildscript.classLoader val klassFromBuildscript = try { @@ -44,7 +44,7 @@ class SubpluginEnvironment( val result = project.plugins.filterIsInstance() - @Suppress("DEPRECATION", "UNCHECKED_CAST") + @Suppress("DEPRECATION_ERROR", "UNCHECKED_CAST") val compatibilitySubplugins = ServiceLoader.load(klass, classloader) .filter { it !is KotlinCompilerPluginSupportPlugin } .map { LegacyKotlinCompilerPluginSupportPlugin(it as KotlinGradleSubplugin) } @@ -139,7 +139,7 @@ internal fun addCompilationSourcesToExternalCompileTask(compilation: KotlinCompi } internal class LegacyKotlinCompilerPluginSupportPlugin( - @Suppress("deprecation") // support for deprecated API + @Suppress("DEPRECATION_ERROR") // support for deprecated API val oldPlugin: KotlinGradleSubplugin ) : KotlinCompilerPluginSupportPlugin { override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean = diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt index 79948e58558..7754d07dc3e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt @@ -213,7 +213,7 @@ private fun Configuration.discoverScriptExtensionsFiles() = class ScriptingKotlinGradleSubplugin : KotlinCompilerPluginSupportPlugin, - @Suppress("DEPRECATION") // implementing to fix KT-39809 + @Suppress("DEPRECATION_ERROR") // implementing to fix KT-39809 KotlinGradleSubplugin { companion object { const val SCRIPTING_ARTIFACT_NAME = "kotlin-scripting-compiler-embeddable" diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt index 24e129fda3b..1d0219b0e2d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt @@ -73,7 +73,7 @@ class AndroidExtensionsSubpluginIndicator @Inject internal constructor(private v class AndroidSubplugin : KotlinCompilerPluginSupportPlugin, - @Suppress("DEPRECATION") // implementing to fix KT-39809 + @Suppress("DEPRECATION_ERROR") // implementing to fix KT-39809 KotlinGradleSubplugin { override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean { diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt b/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt index e9d9f623402..181ece1a180 100644 --- a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt +++ b/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt @@ -29,7 +29,7 @@ import javax.inject.Inject class NoArgGradleSubplugin @Inject internal constructor(private val registry: ToolingModelBuilderRegistry) : KotlinCompilerPluginSupportPlugin, - @Suppress("DEPRECATION") // implementing to fix KT-39809 + @Suppress("DEPRECATION_ERROR") // implementing to fix KT-39809 KotlinGradleSubplugin { companion object { diff --git a/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt b/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt index 3f08d59afff..580b6c692ce 100644 --- a/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt +++ b/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt @@ -29,7 +29,7 @@ import javax.inject.Inject class SamWithReceiverGradleSubplugin @Inject internal constructor(private val registry: ToolingModelBuilderRegistry) : KotlinCompilerPluginSupportPlugin, - @Suppress("DEPRECATION") // implementing to fix KT-39809 + @Suppress("DEPRECATION_ERROR") // implementing to fix KT-39809 KotlinGradleSubplugin { override fun apply(target: Project) { diff --git a/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt b/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt index 8b41551ed36..c55f7e92230 100644 --- a/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt +++ b/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile class SerializationGradleSubplugin : KotlinCompilerPluginSupportPlugin, - @Suppress("DEPRECATION") // implementing to fix KT-39809 + @Suppress("DEPRECATION_ERROR") // implementing to fix KT-39809 KotlinGradleSubplugin { companion object {