From 71e779375f35469a2b4eddafd5b932f763c4e8e8 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Thu, 27 Jul 2023 16:55:06 +0200
Subject: [PATCH] [Gradle] IdeKotlinSourceDependencyMatcher: Migrate to
 'BuildIdentifier.getBuildPath'

^KT-58157 In Progress
---
 .../tcs/IdeaKotlinSourceDependencyMatcher.kt  |  4 +-
 .../tcs/ideaDependencyMatcherBuilders.kt      |  3 +-
 .../kotlin/gradle/mpp/MppCompositeBuildIT.kt  | 39 +++++++++++--------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinSourceDependencyMatcher.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinSourceDependencyMatcher.kt
index 05a3f187190..3bbbe41aa6d 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinSourceDependencyMatcher.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinSourceDependencyMatcher.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency
 
 internal class IdeaKotlinSourceDependencyMatcher(
     val type: IdeaKotlinSourceDependency.Type,
-    val buildName: String,
+    val buildPath: String,
     val projectPath: String,
     val sourceSetName: String
 ) : IdeaKotlinDependencyMatcher {
@@ -20,7 +20,7 @@ internal class IdeaKotlinSourceDependencyMatcher(
     override fun matches(dependency: IdeaKotlinDependency): Boolean {
         if (dependency !is IdeaKotlinSourceDependency) return false
         return dependency.type == type &&
-                dependency.coordinates.buildName == buildName &&
+                dependency.coordinates.buildPath == buildPath &&
                 dependency.coordinates.projectPath == projectPath &&
                 dependency.coordinates.sourceSetName == sourceSetName
     }
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 bee05023e9d..7628e9487ef 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
@@ -25,8 +25,7 @@ fun buildIdeaKotlinDependencyMatchers(notation: Any?): List<IdeaKotlinDependency
 }
 
 fun ideSourceDependency(type: IdeaKotlinSourceDependency.Type, project: Project, sourceSetName: String): IdeaKotlinDependencyMatcher {
-    @Suppress("DEPRECATION") // Should be fixed via https://youtrack.jetbrains.com/issue/KT-58157
-    return IdeaKotlinSourceDependencyMatcher(type, project.currentBuildId().name, project.path, sourceSetName)
+    return IdeaKotlinSourceDependencyMatcher(type, project.currentBuildId().buildPath, project.path, sourceSetName)
 }
 
 fun ideSourceDependency(type: IdeaKotlinSourceDependency.Type, path: String): IdeaKotlinDependencyMatcher {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt
index 2f5c3dc1b5a..f6084876937 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt
@@ -17,6 +17,11 @@ import org.junit.jupiter.api.condition.OS
 
 @MppGradlePluginTests
 @DisplayName("Tests for multiplatform with composite builds")
+/*
+ Testing with maxVersion 8.2, because of significant branching introduced in KT-58157
+ We can remove this, once MAX_SUPPORTED is higher or equal to 8.2
+ */
+@GradleTestVersions(maxVersion = TestVersions.Gradle.G_8_2)
 class MppCompositeBuildIT : KGPBaseTest() {
     @GradleTest
     fun `test - sample0 - ide dependencies`(gradleVersion: GradleVersion) {
@@ -26,15 +31,15 @@ class MppCompositeBuildIT : KGPBaseTest() {
             settingsGradleKts.toFile().replaceText("<producer_path>", producer.projectPath.toUri().path)
             resolveIdeDependencies(":consumerA") { dependencies ->
                 dependencies["commonMain"].assertMatches(
-                    regularSourceDependency("producerBuild::producerA/commonMain"),
+                    regularSourceDependency(":producerBuild::producerA/commonMain"),
                     kotlinStdlibDependencies
                 )
 
                 dependencies["nativeMain"].assertMatches(
                     dependsOnDependency(":consumerA/commonMain"),
-                    regularSourceDependency("producerBuild::producerA/commonMain"),
-                    regularSourceDependency("producerBuild::producerA/nativeMain"),
-                    regularSourceDependency("producerBuild::producerA/linuxMain"),
+                    regularSourceDependency(":producerBuild::producerA/commonMain"),
+                    regularSourceDependency(":producerBuild::producerA/nativeMain"),
+                    regularSourceDependency(":producerBuild::producerA/linuxMain"),
                     kotlinNativeDistributionDependencies,
                     binaryCoordinates(Regex(".*stdlib-common:.*")) /* KT-56278 */
                 )
@@ -48,7 +53,7 @@ class MppCompositeBuildIT : KGPBaseTest() {
                     dependsOnDependency(":consumerA/commonMain"),
                     dependsOnDependency(":consumerA/nativeMain"),
                     dependsOnDependency(":consumerA/linuxMain"),
-                    projectArtifactDependency(Regular, "producerBuild::producerA", FilePathRegex(".*/linuxX64/main/klib/producerA.klib")),
+                    projectArtifactDependency(Regular, ":producerBuild::producerA", FilePathRegex(".*/linuxX64/main/klib/producerA.klib")),
                     kotlinNativeDistributionDependencies,
                 )
             }
@@ -119,7 +124,7 @@ class MppCompositeBuildIT : KGPBaseTest() {
             resolveIdeDependencies { dependencies ->
                 dependencies["commonMain"].assertMatches(
                     kotlinStdlibDependencies,
-                    regularSourceDependency("included-build::included/commonMain")
+                    regularSourceDependency(":included-build::included/commonMain")
                 )
 
                 dependencies["jvmMain"].assertMatches(
@@ -128,7 +133,7 @@ class MppCompositeBuildIT : KGPBaseTest() {
 
                     dependsOnDependency(":/commonMain"),
                     projectArtifactDependency(
-                        Regular, "included-build::included",
+                        Regular, ":included-build::included",
                         FilePathRegex(".*/included-build/included/build/libs/included-jvm.jar")
                     )
                 )
@@ -221,7 +226,7 @@ class MppCompositeBuildIT : KGPBaseTest() {
                     kotlinStdlibDependencies,
                     jetbrainsAnnotationDependencies,
                     projectArtifactDependency(
-                        Regular, "producerBuild::producerA", FilePathRegex(".*producerA/build/libs/producerA-1.0.0-SNAPSHOT.jar")
+                        Regular, ":producerBuild::producerA", FilePathRegex(".*producerA/build/libs/producerA-1.0.0-SNAPSHOT.jar")
                     )
                 )
 
@@ -230,7 +235,7 @@ class MppCompositeBuildIT : KGPBaseTest() {
                     jetbrainsAnnotationDependencies,
                     dependsOnDependency(":consumerA/commonMain"),
                     projectArtifactDependency(
-                        Regular, "producerBuild::producerA", FilePathRegex(".*producerA/build/libs/producerA-1.0.0-SNAPSHOT.jar")
+                        Regular, ":producerBuild::producerA", FilePathRegex(".*producerA/build/libs/producerA-1.0.0-SNAPSHOT.jar")
                     )
                 )
             }
@@ -288,15 +293,15 @@ class MppCompositeBuildIT : KGPBaseTest() {
             settingsGradleKts.toFile().replaceText("<producer_path>", producer.projectPath.toUri().path)
             resolveIdeDependencies(":consumerA") { dependencies ->
                 dependencies["commonMain"].assertMatches(
-                    regularSourceDependency("producerBuild::producerA/commonMain"),
+                    regularSourceDependency(":producerBuild::producerA/commonMain"),
                     kotlinStdlibDependencies
                 )
 
                 dependencies["nativeMain"].assertMatches(
                     dependsOnDependency(":consumerA/commonMain"),
-                    regularSourceDependency("producerBuild::producerA/commonMain"),
-                    regularSourceDependency("producerBuild::producerA/nativeMain"),
-                    regularSourceDependency("producerBuild::producerA/linuxMain"),
+                    regularSourceDependency(":producerBuild::producerA/commonMain"),
+                    regularSourceDependency(":producerBuild::producerA/nativeMain"),
+                    regularSourceDependency(":producerBuild::producerA/linuxMain"),
                     kotlinNativeDistributionDependencies,
                     binaryCoordinates(Regex(".*stdlib-common:.*")) /* KT-56278 */
                 )
@@ -310,7 +315,7 @@ class MppCompositeBuildIT : KGPBaseTest() {
                     dependsOnDependency(":consumerA/commonMain"),
                     dependsOnDependency(":consumerA/nativeMain"),
                     dependsOnDependency(":consumerA/linuxMain"),
-                    projectArtifactDependency(Regular, "producerBuild::producerA", FilePathRegex(".*/linuxX64/main/klib/producerA.klib")),
+                    projectArtifactDependency(Regular, ":producerBuild::producerA", FilePathRegex(".*/linuxX64/main/klib/producerA.klib")),
                     kotlinNativeDistributionDependencies,
                 )
             }
@@ -345,14 +350,14 @@ class MppCompositeBuildIT : KGPBaseTest() {
 
             build(":consumerA:resolveIdeDependencies") {
                 consumerA.readIdeDependencies()["commonMain"].assertMatches(
-                    regularSourceDependency("producer::/commonMain"),
+                    regularSourceDependency(":producer::/commonMain"),
                     kotlinStdlibDependencies
                 )
             }
 
             build(":consumerB:resolveIdeDependencies") {
                 consumerB.readIdeDependencies()["commonMain"].assertMatches(
-                    regularSourceDependency("producer::/commonMain"),
+                    regularSourceDependency(":producer::/commonMain"),
                     kotlinStdlibDependencies
                 )
             }
@@ -366,7 +371,7 @@ class MppCompositeBuildIT : KGPBaseTest() {
     }
 
     @GradleTest
-    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0)
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0, maxVersion = TestVersions.Gradle.G_8_2)
     fun `test sample7`(gradleVersion: GradleVersion) {
         val producer = project("mpp-composite-build/sample7-KT-59863-pluginManagement.includeBuild/producerBuild", gradleVersion)
         project("mpp-composite-build/sample7-KT-59863-pluginManagement.includeBuild/consumerBuild", gradleVersion, defaultBuildOptions) {