From 81216ceb51165dc086068ed43c9a16b39622764f Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <sergey.igushkin@jetbrains.com>
Date: Fri, 24 Jan 2020 23:25:33 +0300
Subject: [PATCH] Use the project name + compilation name for secondary klib
 compilations

This helps avoid duplicate library names when compiling shared-Native
source sets (the resulting klibs will have a more unique name than just
the source set name which likely repeats between projects)
---
 .../test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt   | 2 +-
 .../kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt    | 2 +-
 .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt
index 49f5936361c..bcc02ff62be 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt
@@ -93,7 +93,7 @@ class KlibBasedMppIT : BaseGradleIT() {
             assertTasksExecuted(*tasksToExecute.toTypedArray())
 
             assertFileExists("build/classes/kotlin/metadata/jvmAndJsMain/manifest")
-            assertFileExists("build/classes/kotlin/metadata/iosMain/iosMain.klib")
+            assertFileExists("build/classes/kotlin/metadata/iosMain/${projectName}_iosMain.klib")
 
             // Check that the common and JVM+JS source sets don't receive the Kotlin/Native stdlib in the classpath:
             run {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
index 3c6132a5978..dac827b6dc5 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
@@ -2235,7 +2235,7 @@ class NewMultiplatformIT : BaseGradleIT() {
             assertFileExists("build/classes/kotlin/js/integrationTest/new-mpp-associate-compilations_integrationTest.js")
 
             // Native:
-            assertFileExists("build/classes/kotlin/$nativeHostTargetName/integrationTest/integrationTest.klib")
+            assertFileExists("build/classes/kotlin/$nativeHostTargetName/integrationTest/new-mpp-associate-compilations_integrationTest.klib")
         }
 
         gradleBuildScript().appendText(
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index e04e8303acf..fc262e96433 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -288,7 +288,7 @@ open class KotlinNativeCompile : AbstractKotlinNativeCompile<KotlinCommonOptions
 
     @get:Internal
     override val baseName: String
-        get() = if (compilation.isMainCompilation) project.name else compilation.name
+        get() = if (compilation.isMainCompilation) project.name else "${project.name}_${compilation.name}"
 
     // Inputs and outputs.
     // region Sources.