azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change KotlinGradleSubplugin deprecation level to ERROR.

Browse Source 
^KT-48830 Fixed
This commit is contained in:
Yahor Berdnikau
2021-09-27 16:45:36 +02:00
committed by Space
parent e15cfe8f70
commit 60cbfbf107
10 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleLegacySubplugin.kt
+1 -1
View File
@@ -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<AbstractCompile> {
class ExampleLegacySubplugin : @Suppress("DEPRECATION_ERROR") KotlinGradleSubplugin<AbstractCompile> {
override fun isApplicable(project: Project, task: AbstractCompile): Boolean {
return true
libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt
+1 -1
View File
@@ -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<AbstractCompile> {
companion object {
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt
+2 -1
View File
@@ -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<in KotlinCompile : AbstractCompile> {
fun isApplicable(project: Project, task: AbstractCompile): Boolean
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt
+1 -1
View File
@@ -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<AbstractCompile> {
override fun isApplicable(project: Project, task: AbstractCompile): Boolean = false
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt
+3 -3
View File
@@ -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<KotlinCompilerPluginSupportPlugin>()
@Suppress("DEPRECATION", "UNCHECKED_CAST")
@Suppress("DEPRECATION_ERROR", "UNCHECKED_CAST")
val compatibilitySubplugins = ServiceLoader.load(klass, classloader)
.filter { it !is KotlinCompilerPluginSupportPlugin }
.map { LegacyKotlinCompilerPluginSupportPlugin(it as KotlinGradleSubplugin<AbstractCompile>) }
@@ -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<AbstractCompile>
) : KotlinCompilerPluginSupportPlugin {
override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean =
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt
+1 -1
View File
@@ -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<KotlinCompile> {
companion object {
const val SCRIPTING_ARTIFACT_NAME = "kotlin-scripting-compiler-embeddable"
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidSubplugin.kt
+1 -1
View File
@@ -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<AbstractCompile>
{
override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean {
libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt
+1 -1
View File
@@ -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<AbstractCompile> {
companion object {
libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt
+1 -1
View File
@@ -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<AbstractCompile> {
override fun apply(target: Project) {
libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt
+1 -1
View File
@@ -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<AbstractCompile> {
companion object {