From 030697d430891b5028f029a4e6aa453891db3f8b Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 17 Jun 2021 17:30:58 +0200 Subject: [PATCH] Restore removed 'kotlinPluginVersion' property. And marked it as '@Deprecated'. ^KT-47317 Fixed --- .../gradle/plugin/KotlinPluginWrapper.kt | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt index 33effedb85a..fa0fe607c53 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt @@ -54,6 +54,15 @@ abstract class KotlinBasePluginWrapper : Plugin { private val log = Logging.getLogger(this.javaClass) + @Deprecated( + message = "Scheduled to be removed in 1.7 release", + replaceWith = ReplaceWith( + "project.getKotlinPluginVersion()", + "org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion" + ) + ) + val kotlinPluginVersion by lazy { loadKotlinVersionFromResource(log) } + open val projectExtensionClass: KClass get() = KotlinProjectExtension::class internal open fun kotlinSourceSetFactory(project: Project): NamedDomainObjectFactory = @@ -252,6 +261,20 @@ open class KotlinPm20PluginWrapper @Inject constructor(private val objectFactory get() = KotlinPm20ProjectExtension::class } +@Deprecated( + message = "Scheduled to be removed in 1.7 release", + replaceWith = ReplaceWith( + "project.getKotlinPluginVersion()", + "org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion" + ) +) +fun Plugin<*>.loadKotlinVersionFromResource(log: Logger): String { + log.kotlinDebug("Loading version information") + val projectVersion = loadPropertyFromResources("project.properties", "project.version") + log.kotlinDebug("Found project version [$projectVersion]") + return projectVersion +} + fun Project.getKotlinPluginVersion(): String { if (!kotlinPluginVersionFromResources.isInitialized()) { project.logger.kotlinDebug("Loading version information") @@ -265,4 +288,4 @@ private fun loadKotlinPluginVersionFromResourcesOf(any: Any) = private val kotlinPluginVersionFromResources = lazy { loadKotlinPluginVersionFromResourcesOf(object {}) -} \ No newline at end of file +}