From 1a0e2ad074fe06ea35893f1d689573d505aa2206 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 9 Nov 2021 14:07:00 +0100 Subject: [PATCH] [Gradle][MPP] Composite metadata jar: Use "$sourceSetName-cinterop" directory for cinterops This convention seems to be more robust against clashes against user specified source set names. We could potentially foresee users to use "cinterop" as source set name, but the pattern $sourceSetName-cinterop seems robust enough. ^KT-49596 Verification Pending --- .../internal/CInteropCommonizerCompositeMetadataJarBundling.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerCompositeMetadataJarBundling.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerCompositeMetadataJarBundling.kt index 2444c69b7d1..5abbd77c781 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerCompositeMetadataJarBundling.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerCompositeMetadataJarBundling.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.native.internal import org.gradle.api.Project import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.bundling.Zip +import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSharedNativeCompilation import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropCommonizerCompositeMetadataJarBundling.cinteropMetadataDirectoryPath @@ -29,6 +30,6 @@ internal fun Project.includeCommonizedCInteropMetadata(metadataKlib: Zip, compil internal object CInteropCommonizerCompositeMetadataJarBundling { fun cinteropMetadataDirectoryPath(sourceSetName: String): String { - return "cinterop/$sourceSetName/" + return "$sourceSetName-cinterop" } }