From e07ae23df9a2fce79aa8a4c8fbee7ace3da17193 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 27 Jul 2023 16:48:18 +0200 Subject: [PATCH] [Gradle] Multiplatform import: Migrate to 'BuildIdentifier.getBuildPath' ^KT-58157 In Progress --- .../jetbrains/kotlin/gradle/plugin/ide/factories.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt index 7c13b581edf..436c9c26097 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt @@ -6,33 +6,42 @@ package org.jetbrains.kotlin.gradle.plugin.ide import org.gradle.api.Project +import org.gradle.api.artifacts.component.BuildIdentifier import org.gradle.api.artifacts.component.ModuleComponentIdentifier import org.gradle.api.artifacts.component.ProjectComponentIdentifier import org.gradle.api.attributes.AttributeContainer import org.gradle.api.capabilities.Capability +import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.idea.tcs.* import org.jetbrains.kotlin.gradle.idea.tcs.extras.KlibExtra import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.currentBuildId +import org.jetbrains.kotlin.gradle.utils.buildNameCompat +import org.jetbrains.kotlin.gradle.utils.buildPathCompat import org.jetbrains.kotlin.library.* internal fun IdeaKotlinProjectCoordinates(identifier: ProjectComponentIdentifier): IdeaKotlinProjectCoordinates { return IdeaKotlinProjectCoordinates( - buildId = identifier.build.name, + buildPath = identifier.build.buildPathCompat, + buildName = identifier.build.buildNameCompat, projectPath = identifier.projectPath, projectName = identifier.projectName ) } internal fun IdeaKotlinProjectCoordinates(project: Project): IdeaKotlinProjectCoordinates { + val buildIdentifier = project.currentBuildId() return IdeaKotlinProjectCoordinates( - buildId = project.currentBuildId().name, + buildPath = buildIdentifier.buildPathCompat, + buildName = buildIdentifier.buildNameCompat, projectPath = project.path, projectName = project.name ) } + + internal fun IdeaKotlinSourceCoordinates(sourceSet: KotlinSourceSet): IdeaKotlinSourceCoordinates { return IdeaKotlinSourceCoordinates( project = IdeaKotlinProjectCoordinates(sourceSet.project),