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

[Gradle, K/N] Fix deprecation message for endorsed libraries

Browse Source 
#KT-54177
This commit is contained in:
Alexander Likhachev
2022-09-29 13:37:11 +02:00
parent 85965d74f6
commit a3ad0a6e88
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt
+1 -1
View File
@@ -19,7 +19,7 @@ internal class GradleKpmNativeVariantCompilationData(
get() = variant.konanTarget get() = variant.konanTarget
@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") @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 override val enableEndorsedLibs: Boolean
get() = variant.enableEndorsedLibraries get() = variant.enableEndorsedLibraries
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt
+2 -2
View File
@@ -29,7 +29,7 @@ abstract class GradleKpmNativeVariantInternal(
), ),
GradleKpmSingleMavenPublishedModuleHolder by GradleKpmDefaultSingleMavenPublishedModuleHolder(containingModule, fragmentName) { 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 var enableEndorsedLibraries: Boolean = false
override val gradleVariantNames: Set<String> override val gradleVariantNames: Set<String>
@@ -45,7 +45,7 @@ abstract class GradleKpmNativeVariantInternal(
interface KotlinNativeCompilationData<T : KotlinCommonOptions> : KotlinCompilationData<T> { interface KotlinNativeCompilationData<T : KotlinCommonOptions> : KotlinCompilationData<T> {
val konanTarget: KonanTarget 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 val enableEndorsedLibs: Boolean
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt
+1 -1
View File
@@ -199,7 +199,7 @@ internal open class KotlinNativeFragmentMetadataCompilationDataImpl(
} }
@Suppress("DeprecatedCallableAddReplaceWith") @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 override val enableEndorsedLibs: Boolean
get() = false get() = false
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt
+1 -1
View File
@@ -48,7 +48,7 @@ abstract class AbstractKotlinNativeCompilation(
get() = project.nativeUseEmbeddableCompilerJar get() = project.nativeUseEmbeddableCompilerJar
// Endorsed library controller. // 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 override var enableEndorsedLibs: Boolean = false
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt
+1 -1
View File
@@ -279,7 +279,7 @@ constructor(
} }
@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") @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 @get:Input
val enableEndorsedLibs: Boolean get() = compilation.enableEndorsedLibs val enableEndorsedLibs: Boolean get() = compilation.enableEndorsedLibs
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+1 -1
View File
@@ -208,7 +208,7 @@ abstract class AbstractKotlinNativeCompile<
get() = languageSettings.progressiveMode get() = languageSettings.progressiveMode
// endregion. // 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 @get:Input
val enableEndorsedLibs: Boolean by project.provider { compilation.enableEndorsedLibs } val enableEndorsedLibs: Boolean by project.provider { compilation.enableEndorsedLibs }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
+1 -1
View File
@@ -63,7 +63,7 @@ open class KotlinNativeLinkArtifactTask @Inject constructor(
@get:Input @get:Input
var debuggable: Boolean = true 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 @get:Input
var enableEndorsedLibs: Boolean = false var enableEndorsedLibs: Boolean = false