From f05856f6a02193197cc5b74ce1a57ad3ce997f3e Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Wed, 19 Jul 2023 10:16:32 +0200 Subject: [PATCH] [Gradle] Lower deprecation level of KotlinCompilation source method It makes IDE Import failing when method is used. So tooling diagnostic with ERROR level is preferred in such cases. ^KT-58234 Verification Pending --- .../org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt | 2 +- .../gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt | 2 +- .../kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt | 2 +- .../unitTests/diagnosticsTests/MppDiagnosticsFunctionalTest.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt index a9c20c890af..d0840da8f70 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt @@ -131,7 +131,7 @@ interface KotlinCompilation : Named, * Further details: * https://kotl.in/compilation-source-deprecation */ - @Deprecated("scheduled for removal with Kotlin 2.0", level = DeprecationLevel.ERROR) + @Deprecated("scheduled for removal with Kotlin 2.0") fun source(sourceSet: KotlinSourceSet) fun associateWith(other: KotlinCompilation<*>) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt index 1169f20da9c..b0e889e87a6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt @@ -91,7 +91,7 @@ internal class KotlinCompilationImpl constructor( override val kotlinSourceSets: ObservableSet get() = sourceSets.kotlinSourceSets - @Deprecated("scheduled for removal with Kotlin 2.0", level = DeprecationLevel.ERROR) + @Deprecated("scheduled for removal with Kotlin 2.0") override fun source(sourceSet: KotlinSourceSet) { project.kotlinToolingDiagnosticsCollector.report(project, KotlinCompilationSourceDeprecation(Throwable())) sourceSets.source(sourceSet) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt index a1033fb4995..58bed7c5f7d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt @@ -217,7 +217,7 @@ class SourceSetCommonizerTargetTest { val nativeMain = kotlin.sourceSets.create("nativeMain") listOf(linux1, linux2).forEach { target -> - @Suppress("DEPRECATION_ERROR") + @Suppress("DEPRECATION") target.compilations.getByName("main").source(nativeMain) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/MppDiagnosticsFunctionalTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/MppDiagnosticsFunctionalTest.kt index d3494225f15..11ec82c128e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/MppDiagnosticsFunctionalTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/MppDiagnosticsFunctionalTest.kt @@ -112,7 +112,7 @@ class MppDiagnosticsFunctionalTest { checkDiagnosticsWithMppProject("kotlinCompilationSourceDeprecation") { kotlin { val customMain = sourceSets.create("customMain") - @Suppress("DEPRECATION_ERROR") + @Suppress("DEPRECATION") jvm().compilations.create("custom").source(customMain) } }