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

[KPM] IdeaKotlinProjectModel: Add gradlePluginVersion

Browse Source 
KT-51262
KT-51220
This commit is contained in:
sebastian.sellmair
2022-02-15 10:09:13 +01:00
committed by Space
parent 0284bf8cea
commit 5ad1292b67
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModel.kt
+2
View File
@@ -9,6 +9,7 @@ import java.io.File
import java.io.Serializable import java.io.Serializable
interface IdeaKotlinProjectModel : Serializable { interface IdeaKotlinProjectModel : Serializable {
val gradlePluginVersion: String
val coreLibrariesVersion: String val coreLibrariesVersion: String
val explicitApiModeCliOption: String? val explicitApiModeCliOption: String?
val kotlinNativeHome: File val kotlinNativeHome: File
@@ -17,6 +18,7 @@ interface IdeaKotlinProjectModel : Serializable {
@InternalKotlinGradlePluginApi @InternalKotlinGradlePluginApi
data class IdeaKotlinProjectModelImpl( data class IdeaKotlinProjectModelImpl(
override val gradlePluginVersion: String,
override val coreLibrariesVersion: String, override val coreLibrariesVersion: String,
override val explicitApiModeCliOption: String?, override val explicitApiModeCliOption: String?,
override val kotlinNativeHome: File, override val kotlinNativeHome: File,
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt
+2
View File
@@ -4,6 +4,7 @@ import org.gradle.api.Project
import org.gradle.tooling.provider.model.ToolingModelBuilder import org.gradle.tooling.provider.model.ToolingModelBuilder
import org.jetbrains.kotlin.compilerRunner.konanHome import org.jetbrains.kotlin.compilerRunner.konanHome
import org.jetbrains.kotlin.gradle.dsl.pm20Extension import org.jetbrains.kotlin.gradle.dsl.pm20Extension
import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
import java.io.File import java.io.File
@@ -16,6 +17,7 @@ class IdeaKotlinProjectModelBuilder : ToolingModelBuilder {
internal fun KotlinPm20ProjectExtension.toIdeaKotlinProjectModel(): IdeaKotlinProjectModel { internal fun KotlinPm20ProjectExtension.toIdeaKotlinProjectModel(): IdeaKotlinProjectModel {
return IdeaKotlinProjectModelImpl( return IdeaKotlinProjectModelImpl(
gradlePluginVersion = project.getKotlinPluginVersion(),
coreLibrariesVersion = coreLibrariesVersion, coreLibrariesVersion = coreLibrariesVersion,
explicitApiModeCliOption = explicitApi?.cliOption, explicitApiModeCliOption = explicitApi?.cliOption,
kotlinNativeHome = File(project.konanHome).absoluteFile, kotlinNativeHome = File(project.konanHome).absoluteFile,