[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
This commit is contained in:
committed by
Space
parent
ea669ce076
commit
1a0e2ad074
+2
-1
@@ -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"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user