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

[Gradle] Multiplatform import: Migrate to 'BuildIdentifier.getBuildPath'

Browse Source 
^KT-58157 In Progress
This commit is contained in:
Sebastian Sellmair
2023-07-27 16:48:18 +02:00
committed by Space Team
parent c174bb9aa9
commit e07ae23df9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt
+11 -2
View File
@@ -6,33 +6,42 @@
package org.jetbrains.kotlin.gradle.plugin.ide package org.jetbrains.kotlin.gradle.plugin.ide
import org.gradle.api.Project 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.ModuleComponentIdentifier
import org.gradle.api.artifacts.component.ProjectComponentIdentifier import org.gradle.api.artifacts.component.ProjectComponentIdentifier
import org.gradle.api.attributes.AttributeContainer import org.gradle.api.attributes.AttributeContainer
import org.gradle.api.capabilities.Capability 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.*
import org.jetbrains.kotlin.gradle.idea.tcs.extras.KlibExtra import org.jetbrains.kotlin.gradle.idea.tcs.extras.KlibExtra
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.currentBuildId 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.* import org.jetbrains.kotlin.library.*
internal fun IdeaKotlinProjectCoordinates(identifier: ProjectComponentIdentifier): IdeaKotlinProjectCoordinates { internal fun IdeaKotlinProjectCoordinates(identifier: ProjectComponentIdentifier): IdeaKotlinProjectCoordinates {
return IdeaKotlinProjectCoordinates( return IdeaKotlinProjectCoordinates(
buildId = identifier.build.name, buildPath = identifier.build.buildPathCompat,
buildName = identifier.build.buildNameCompat,
projectPath = identifier.projectPath, projectPath = identifier.projectPath,
projectName = identifier.projectName projectName = identifier.projectName
) )
} }
internal fun IdeaKotlinProjectCoordinates(project: Project): IdeaKotlinProjectCoordinates { internal fun IdeaKotlinProjectCoordinates(project: Project): IdeaKotlinProjectCoordinates {
val buildIdentifier = project.currentBuildId()
return IdeaKotlinProjectCoordinates( return IdeaKotlinProjectCoordinates(
buildId = project.currentBuildId().name, buildPath = buildIdentifier.buildPathCompat,
buildName = buildIdentifier.buildNameCompat,
projectPath = project.path, projectPath = project.path,
projectName = project.name projectName = project.name
) )
} }
internal fun IdeaKotlinSourceCoordinates(sourceSet: KotlinSourceSet): IdeaKotlinSourceCoordinates { internal fun IdeaKotlinSourceCoordinates(sourceSet: KotlinSourceSet): IdeaKotlinSourceCoordinates {
return IdeaKotlinSourceCoordinates( return IdeaKotlinSourceCoordinates(
project = IdeaKotlinProjectCoordinates(sourceSet.project), project = IdeaKotlinProjectCoordinates(sourceSet.project),