From a58f04e30b15f97321ff2b1835b37679210e63cb Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Tue, 1 Feb 2022 00:47:36 +0400 Subject: [PATCH] KPM: add module name to directory names in the sources JAR For example, it will now be `common` -> `commonMain`, so that the behavior emulates the sources JARs built by the stable MPP plugin --- .../plugin/mpp/pm20/KotlinSourceArchiveTaskConfigurator.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinSourceArchiveTaskConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinSourceArchiveTaskConfigurator.kt index 99a1df098a8..d3d3a1581d9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinSourceArchiveTaskConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinSourceArchiveTaskConfigurator.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 import org.gradle.api.tasks.TaskProvider +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.unambiguousNameInProject import org.jetbrains.kotlin.gradle.plugin.mpp.sourcesJarTaskNamed interface KotlinSourceArchiveTaskConfigurator { @@ -19,7 +20,7 @@ object DefaultKotlinSourceArchiveTaskConfigurator : KotlinSourceArchiveTaskConfi project = variant.project, sourceSets = lazy { FragmentSourcesProvider().getSourcesFromRefinesClosureAsMap(variant) - .entries.associate { it.key.fragmentName to it.value.get() } + .entries.associate { it.key.unambiguousNameInProject to it.value.get() } }, artifactNameAppendix = variant.name )