From 4bc1271f554de507390b8584f319e02d549565c9 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 6 Apr 2023 11:35:00 +0200 Subject: [PATCH] [Gradle] AbstractCInteropCommonizerTask: Do not use ';' character in fileName The ';' will later be used as path separator. Therefore, using the ';' as joiner for multiple cinterop commonizer groups will confuse the CLI argument parser inside the Commonizer ^KT-57796 Verification Pending --- .../targets/native/internal/AbstractCInteropCommonizerTask.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/AbstractCInteropCommonizerTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/AbstractCInteropCommonizerTask.kt index 2b6e8038259..3a634e203ad 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/AbstractCInteropCommonizerTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/AbstractCInteropCommonizerTask.kt @@ -25,7 +25,7 @@ internal abstract class AbstractCInteropCommonizerTask : DefaultTask() { } internal fun AbstractCInteropCommonizerTask.outputDirectory(group: CInteropCommonizerGroup): File { - val interopsDirectoryName = group.interops.map { it.interopName }.toSet().joinToString(";") + val interopsDirectoryName = group.interops.map { it.interopName }.toSet().joinToString(":") val groupDisambiguation = group.targets.joinToString { it.identityString } + group.interops.joinToString { it.uniqueName }