From 33a61c62ba4e2d5342e8f4d2084c093c3f15ff95 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Thu, 27 Jul 2023 17:39:49 +0200
Subject: [PATCH] [Gradle] IdeaKotlinProjectArtifactDependencyMatcher: Migrate
 to 'BuildIdentifier.getBuildPath'

^KT-58157 In Progress
---
 .../tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt         | 4 ++--
 .../idea/testFixtures/tcs/ideaDependencyMatcherBuilders.kt    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt
index 4a86b61a5af..715e5e797b7 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt
@@ -13,7 +13,7 @@ import java.io.File
 
 internal class IdeaKotlinProjectArtifactDependencyMatcher(
     val type: IdeaKotlinSourceDependency.Type,
-    val buildId: String,
+    val buildPath: String,
     val projectPath: String,
     val artifactFilePath: FilePathRegex
 ) : IdeaKotlinDependencyMatcher {
@@ -23,7 +23,7 @@ internal class IdeaKotlinProjectArtifactDependencyMatcher(
     override fun matches(dependency: IdeaKotlinDependency): Boolean {
         if (dependency !is IdeaKotlinProjectArtifactDependency) return false
         return dependency.type == type &&
-                dependency.coordinates.buildId == buildId &&
+                dependency.coordinates.buildPath == buildPath &&
                 dependency.coordinates.projectPath == projectPath &&
                 dependency.artifactsClasspath.any { artifactFilePath.matches(it) }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/ideaDependencyMatcherBuilders.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/ideaDependencyMatcherBuilders.kt
index 7628e9487ef..0345f260d90 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/ideaDependencyMatcherBuilders.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/ideaDependencyMatcherBuilders.kt
@@ -51,12 +51,12 @@ fun projectArtifactDependency(
     buildIdAndProjectPath: String, artifactFilePath: FilePathRegex
 ): IdeaKotlinDependencyMatcher {
     val slicedProjectPath = buildIdAndProjectPath.split("::", limit = 2)
-    val buildId = if (slicedProjectPath.size == 2) slicedProjectPath.first() else ":"
+    val buildPath = if (slicedProjectPath.size == 2) slicedProjectPath.first() else ":"
     val projectPath = if (slicedProjectPath.size == 2) ":" + slicedProjectPath.last() else slicedProjectPath.last()
 
     return IdeaKotlinProjectArtifactDependencyMatcher(
         type = type,
-        buildId = buildId,
+        buildPath = buildPath,
         projectPath = projectPath,
         artifactFilePath = artifactFilePath
     )