From 798f0efcf64248b3de394e66d301028d0a2816e6 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Tue, 30 Aug 2022 02:18:25 +0200 Subject: [PATCH] [Gradle] Prevent false positive warning about XCFramework names mismatch #KT-53686 --- .../kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt index d0f0b37a918..35038603963 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt @@ -218,16 +218,17 @@ abstract class XCFrameworkTask : DefaultTask() { @TaskAction fun assemble() { val frameworks = groupedFrameworkFiles.values.flatten() + val xcfName = xcFrameworkName.get() if (frameworks.isNotEmpty()) { - val xcfName = baseName.get() + val rawXcfName = baseName.get() val name = frameworks.first().name if (frameworks.any { it.name != name }) { - error("All inner frameworks in XCFramework '$xcfName' should have same names!" + + error("All inner frameworks in XCFramework '$rawXcfName' should have same names!" + frameworks.joinToString("\n") { it.file.path }) } if (name != xcfName) { logger.warn( - "Name of XCFramework '$xcfName' differs from inner frameworks name '$name'! Framework renaming is not supported yet" + "Name of XCFramework '$rawXcfName' differs from inner frameworks name '$name'! Framework renaming is not supported yet" ) } } @@ -236,7 +237,7 @@ abstract class XCFrameworkTask : DefaultTask() { when { files.size == 1 -> files.first() files.size > 1 -> FrameworkDescriptor( - fatFrameworksDir.resolve(group.targetName).resolve("${xcFrameworkName.get()}.framework"), + fatFrameworksDir.resolve(group.targetName).resolve("$xcfName.framework"), files.all { it.isStatic }, group.targets.first() //will be not used )