From 2b41a0d30e7c522c8648f4a692b76ba42bd8ac57 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Tue, 3 Apr 2018 17:30:59 +0300
Subject: [PATCH] Use `archivesBaseName` for module names in MPP common modules
 as well.

Issue #KT-23574 Fixed
---
 .../kotlin/gradle/MultiplatformGradleIT.kt         | 14 ++++++++++++++
 .../kotlin/gradle/tasks/KotlinCompileCommon.kt     |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt
index 12c27c9e40e..cb73ff69be5 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt
@@ -222,4 +222,18 @@ class MultiplatformGradleIT : BaseGradleIT() {
             assertContains("Dependency: 'lib'")
         }
     }
+
+    @Test
+    fun testArchivesBaseNameAsCommonModuleName() = with(Project("multiplatformProject")) {
+        setupWorkingDir()
+
+        val moduleName = "my_module_name"
+
+        gradleBuildScript("lib").appendText("\narchivesBaseName = '$moduleName'")
+
+        build("compileKotlinCommon") {
+            assertSuccessful()
+            assertFileExists(kotlinClassesDir(subproject = "lib") + "META-INF/$moduleName.kotlin_module")
+        }
+    }
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
index 94fc7198d00..131233a85e2 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
@@ -50,10 +50,11 @@ internal open class KotlinCompileCommon : AbstractKotlinCompile<K2MetadataCompil
         args.apply { fillDefaultValues() }
         super.setupCompilerArgs(args, defaultsOnly)
 
+        args.moduleName = friendTask?.moduleName ?: this@KotlinCompileCommon.moduleName
+
         if (defaultsOnly) return
 
         val classpathList = classpath.files.toMutableList()
-        val friendTask = friendTaskName?.let { project.tasks.findByName(it) } as? AbstractCompile
         friendTask?.let { classpathList.add(it.destinationDir) }
 
         with(args) {