From 317b9d28e05c290d5cd69e7eb7b6f06d49c9977c Mon Sep 17 00:00:00 2001
From: Pavel Kirpichenkov <pavel.kirpichenkov@jetbrains.com>
Date: Tue, 14 Feb 2023 17:49:08 +0200
Subject: [PATCH] [MPP] Use correct name for resolved K/N distribution
 libraries for IDE

KT-56671
---
 .../kotlin/gradle/MppIdeDependencyResolutionIT.kt         | 8 ++++----
 .../resolveNativeDistributionDependency.kt                | 4 ++--
 .../tcs/IdeNativePlatformDependencyResolverTest.kt        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt
index 6e0d34feaa6..3bf038b6a74 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt
@@ -78,13 +78,13 @@ class MppIdeDependencyResolutionIT : KGPBaseTest() {
                 /* Find posix library */
                 run {
                     nativeMainDependencies.assertMatches(
-                        binaryCoordinates(Regex("org\\.jetbrains\\.kotlin\\.native:platform.posix:.*")),
-                        binaryCoordinates(Regex("org\\.jetbrains\\.kotlin\\.native:platform.*"))
+                        binaryCoordinates(Regex("org\\.jetbrains\\.kotlin\\.native:posix:.*")),
+                        binaryCoordinates(Regex("org\\.jetbrains\\.kotlin\\.native:.*"))
                     )
 
                     linuxMainDependencies.assertMatches(
-                        binaryCoordinates(Regex("org\\.jetbrains\\.kotlin\\.native:platform.posix:.*")),
-                        binaryCoordinates(Regex("org\\.jetbrains\\.kotlin\\.native:platform.*"))
+                        binaryCoordinates(Regex("org\\.jetbrains\\.kotlin\\.native:posix:.*")),
+                        binaryCoordinates(Regex("org\\.jetbrains\\.kotlin\\.native:.*"))
                     )
                 }
             }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/resolveNativeDistributionDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/resolveNativeDistributionDependency.kt
index 143ed596701..362e7367e64 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/resolveNativeDistributionDependency.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/resolveNativeDistributionDependency.kt
@@ -40,8 +40,8 @@ internal fun Project.resolveNativeDistributionLibraryForIde(
         classpath = IdeaKotlinClasspath(library),
         coordinates = IdeaKotlinBinaryCoordinates(
             group = "org.jetbrains.kotlin.native",
-            module = resolvedLibrary.packageFqName ?: resolvedLibrary.shortName ?: resolvedLibrary.uniqueName,
-            version = project.konanVersion.toString(),
+            module = resolvedLibrary.shortName ?: resolvedLibrary.uniqueName.split(".").last(),
+            version = project.konanVersion,
             sourceSetName = target.identityString
         ),
     ).apply {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeNativePlatformDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeNativePlatformDependencyResolverTest.kt
index 606fa24d0a6..c371911a5c8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeNativePlatformDependencyResolverTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeNativePlatformDependencyResolverTest.kt
@@ -33,7 +33,7 @@ class IdeNativePlatformDependencyResolverTest {
         val linuxX64Test = kotlin.sourceSets.getByName("linuxX64Test")
 
         val dependencies = listOf(
-            binaryCoordinates("org.jetbrains.kotlin.native:platform.posix:${project.konanVersion}:$LINUX_X64"),
+            binaryCoordinates("org.jetbrains.kotlin.native:posix:${project.konanVersion}:$LINUX_X64"),
             binaryCoordinates(Regex("""org\.jetbrains\.kotlin\.native:.*:${project.konanVersion}:$LINUX_X64"""))
         )
 
@@ -56,7 +56,7 @@ class IdeNativePlatformDependencyResolverTest {
         val macosArm64Test = kotlin.sourceSets.getByName("macosArm64Test")
 
         val dependencies = listOf(
-            binaryCoordinates("org.jetbrains.kotlin.native:platform.CoreFoundation:${project.konanVersion}:$MACOS_ARM64"),
+            binaryCoordinates("org.jetbrains.kotlin.native:CoreFoundation:${project.konanVersion}:$MACOS_ARM64"),
             binaryCoordinates(Regex("""org\.jetbrains\.kotlin\.native:.*:${project.konanVersion}:$MACOS_ARM64"""))
         )