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

Remove 'kotlinPluginVersion' property

Browse Source 
^KT-47318 Fixed
This commit is contained in:
Yahor Berdnikau
2022-02-18 15:29:48 +01:00
committed by Space
parent 9d0d26e15d
commit 9943b146e9
1 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
-27
View File
@@ -20,7 +20,6 @@ import org.gradle.api.GradleException
import org.gradle.api.NamedDomainObjectFactory
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging
import org.gradle.api.model.ObjectFactory
import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
@@ -29,7 +28,6 @@ import org.jetbrains.kotlin.gradle.dsl.*
import org.jetbrains.kotlin.gradle.internal.KOTLIN_COMPILER_EMBEDDABLE
import org.jetbrains.kotlin.gradle.internal.KOTLIN_MODULE_GROUP
import org.jetbrains.kotlin.gradle.logging.kotlinDebug
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20GradlePlugin
@@ -55,17 +53,6 @@ import kotlin.reflect.KClass
abstract class KotlinBasePluginWrapper : Plugin<Project> {
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<out KotlinTopLevelExtension> get() = KotlinProjectExtension::class
internal open fun kotlinSourceSetFactory(project: Project): NamedDomainObjectFactory<KotlinSourceSet> =
@@ -267,20 +254,6 @@ open class KotlinPm20PluginWrapper @Inject constructor(
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")