From b0c360b1b6b3a44b8558ed94a50bc0ed445b21d9 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Tue, 24 Jan 2023 15:28:00 +0200 Subject: [PATCH] [MPP] Change the deprecation message for HMPP properties KT-55891 --- .../jetbrains/kotlin/gradle/mpp/MppDeprecatedPropertiesIt.kt | 2 +- .../gradle/plugin/mpp/internal/deprecationDiagnostics.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDeprecatedPropertiesIt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDeprecatedPropertiesIt.kt index ac8b1eb938f..84f632125b0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDeprecatedPropertiesIt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDeprecatedPropertiesIt.kt @@ -39,7 +39,7 @@ class MppDeprecatedPropertiesIt : KGPBaseTest() { defaultFlags.keys.forEach { flag -> assert( - warnings.any { warning -> Regex(".*$flag.*is deprecated.*").matches(warning) }, + warnings.any { warning -> Regex(".*$flag.*is obsolete.*").matches(warning) }, "A deprecation warning for the '$flag' should have been reported", ) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/deprecationDiagnostics.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/deprecationDiagnostics.kt index 39854704221..a0fd02168de 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/deprecationDiagnostics.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/deprecationDiagnostics.kt @@ -66,4 +66,5 @@ internal val deprecatedMppProperties: List = listOf( ) internal fun getMppDeprecationWarningMessageForProperty(property: String): String = - "w: The property '$property' is deprecated and is scheduled for removal in the stable Kotlin Multiplatform." + "w: The property '$property' is obsolete and will be removed in Kotlin 1.9. Read the details here: " + + "https://kotlinlang.org/docs/multiplatform-compatibility-guide.html#deprecate-hmpp-properties"