From a3ad0a6e88f87b31e00aac71b0cc67385a06b5da Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Thu, 29 Sep 2022 13:37:11 +0200 Subject: [PATCH] [Gradle, K/N] Fix deprecation message for endorsed libraries #KT-54177 --- .../plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt | 2 +- .../gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt | 4 ++-- .../gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt | 2 +- .../kotlin/gradle/targets/native/KotlinNativeCompilation.kt | 2 +- .../kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt | 2 +- .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt | 2 +- .../native/tasks/artifact/KotlinNativeLinkArtifactTask.kt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt index be0698edc09..f27e85e3a68 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt @@ -19,7 +19,7 @@ internal class GradleKpmNativeVariantCompilationData( get() = variant.konanTarget @Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") - @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") + @Deprecated("Please declare explicit dependency on kotlinx-cli. This option is scheduled to be removed in 1.9.0") override val enableEndorsedLibs: Boolean get() = variant.enableEndorsedLibraries diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt index e09b4f038dc..836541b522b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt @@ -29,7 +29,7 @@ abstract class GradleKpmNativeVariantInternal( ), GradleKpmSingleMavenPublishedModuleHolder by GradleKpmDefaultSingleMavenPublishedModuleHolder(containingModule, fragmentName) { - @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") + @Deprecated("Please declare explicit dependency on kotlinx-cli. This option is scheduled to be removed in 1.9.0") override var enableEndorsedLibraries: Boolean = false override val gradleVariantNames: Set @@ -45,7 +45,7 @@ abstract class GradleKpmNativeVariantInternal( interface KotlinNativeCompilationData : KotlinCompilationData { val konanTarget: KonanTarget - @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") + @Deprecated("Please declare explicit dependency on kotlinx-cli. This option is scheduled to be removed in 1.9.0") val enableEndorsedLibs: Boolean } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt index f00539d3791..fd06f841616 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt @@ -199,7 +199,7 @@ internal open class KotlinNativeFragmentMetadataCompilationDataImpl( } @Suppress("DeprecatedCallableAddReplaceWith") - @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") + @Deprecated("Please declare explicit dependency on kotlinx-cli. This option is scheduled to be removed in 1.9.0") override val enableEndorsedLibs: Boolean get() = false } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt index 498071afcce..7a847827780 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt @@ -48,7 +48,7 @@ abstract class AbstractKotlinNativeCompilation( get() = project.nativeUseEmbeddableCompilerJar // Endorsed library controller. - @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") + @Deprecated("Please declare explicit dependency on kotlinx-cli. This option is scheduled to be removed in 1.9.0") override var enableEndorsedLibs: Boolean = false } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt index 52a5562fd77..b9dbbfdc92e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt @@ -279,7 +279,7 @@ constructor( } @Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") - @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") + @Deprecated("Please declare explicit dependency on kotlinx-cli. This option is scheduled to be removed in 1.9.0") @get:Input val enableEndorsedLibs: Boolean get() = compilation.enableEndorsedLibs diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index 603a9db22b9..150090cea39 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -208,7 +208,7 @@ abstract class AbstractKotlinNativeCompile< get() = languageSettings.progressiveMode // endregion. - @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") + @Deprecated("Please declare explicit dependency on kotlinx-cli. This option is scheduled to be removed in 1.9.0") @get:Input val enableEndorsedLibs: Boolean by project.provider { compilation.enableEndorsedLibs } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt index 72de4ddfb4e..eb38afda28f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt @@ -63,7 +63,7 @@ open class KotlinNativeLinkArtifactTask @Inject constructor( @get:Input var debuggable: Boolean = true - @Deprecated("Declare dependencies explicitly please. This option is scheduled to be removed in 1.9.0") + @Deprecated("Please declare explicit dependency on kotlinx-cli. This option is scheduled to be removed in 1.9.0") @get:Input var enableEndorsedLibs: Boolean = false