From 5ad1292b67c93d75b4e269750710420f64c53787 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 15 Feb 2022 10:09:13 +0100 Subject: [PATCH] [KPM] IdeaKotlinProjectModel: Add gradlePluginVersion KT-51262 KT-51220 --- .../jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModel.kt | 2 ++ .../kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModel.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModel.kt index a77e9fce8b5..4362269b345 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModel.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModel.kt @@ -9,6 +9,7 @@ import java.io.File import java.io.Serializable interface IdeaKotlinProjectModel : Serializable { + val gradlePluginVersion: String val coreLibrariesVersion: String val explicitApiModeCliOption: String? val kotlinNativeHome: File @@ -17,6 +18,7 @@ interface IdeaKotlinProjectModel : Serializable { @InternalKotlinGradlePluginApi data class IdeaKotlinProjectModelImpl( + override val gradlePluginVersion: String, override val coreLibrariesVersion: String, override val explicitApiModeCliOption: String?, override val kotlinNativeHome: File, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt index b97b317120f..40e3321cb0e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt @@ -4,6 +4,7 @@ import org.gradle.api.Project import org.gradle.tooling.provider.model.ToolingModelBuilder import org.jetbrains.kotlin.compilerRunner.konanHome import org.jetbrains.kotlin.gradle.dsl.pm20Extension +import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension import java.io.File @@ -16,6 +17,7 @@ class IdeaKotlinProjectModelBuilder : ToolingModelBuilder { internal fun KotlinPm20ProjectExtension.toIdeaKotlinProjectModel(): IdeaKotlinProjectModel { return IdeaKotlinProjectModelImpl( + gradlePluginVersion = project.getKotlinPluginVersion(), coreLibrariesVersion = coreLibrariesVersion, explicitApiModeCliOption = explicitApi?.cliOption, kotlinNativeHome = File(project.konanHome).absoluteFile,