From a55b74d4e0a25190715325552e100b44b2793a4f Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Mon, 10 Jul 2023 13:45:56 +0200 Subject: [PATCH] [Gradle] Elevate DeprecatedJvmWithJavaPresetDiagnostic to error ^KT-59320 Verification Pending --- .../gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt | 2 +- .../expectedDiagnostics/deprecatedJvmWithJavaPreset.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt index 729ea3b6095..47d08f229ba 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt @@ -47,7 +47,7 @@ object KotlinToolingDiagnostics { ) } - object DeprecatedJvmWithJavaPresetDiagnostic : ToolingDiagnosticFactory(WARNING) { + object DeprecatedJvmWithJavaPresetDiagnostic : ToolingDiagnosticFactory(ERROR) { operator fun invoke() = build( """ The 'jvmWithJava' preset is deprecated and will be removed soon. Please use an ordinary JVM target with Java support: diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/deprecatedJvmWithJavaPreset.txt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/deprecatedJvmWithJavaPreset.txt index 5d0b68126bb..fb6c854a8cc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/deprecatedJvmWithJavaPreset.txt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/deprecatedJvmWithJavaPreset.txt @@ -1,4 +1,4 @@ -[DeprecatedJvmWithJavaPresetDiagnostic | WARNING] The 'jvmWithJava' preset is deprecated and will be removed soon. Please use an ordinary JVM target with Java support: +[DeprecatedJvmWithJavaPresetDiagnostic | ERROR] The 'jvmWithJava' preset is deprecated and will be removed soon. Please use an ordinary JVM target with Java support: kotlin { jvm {