azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Prevent false positive warning about XCFramework names mismatch

Browse Source 
#KT-53686
This commit is contained in:
Alexander Likhachev
2022-08-30 02:18:25 +02:00
committed by Space
parent 3836915012
commit 798f0efcf6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/XCFrameworkTask.kt
+5 -4
View File
@@ -218,16 +218,17 @@ abstract class XCFrameworkTask : DefaultTask() {
@TaskAction @TaskAction
fun assemble() { fun assemble() {
val frameworks = groupedFrameworkFiles.values.flatten() val frameworks = groupedFrameworkFiles.values.flatten()
val xcfName = xcFrameworkName.get()
if (frameworks.isNotEmpty()) { if (frameworks.isNotEmpty()) {
val xcfName = baseName.get() val rawXcfName = baseName.get()
val name = frameworks.first().name val name = frameworks.first().name
if (frameworks.any { it.name != 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 }) frameworks.joinToString("\n") { it.file.path })
} }
if (name != xcfName) { if (name != xcfName) {
logger.warn( 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 { when {
files.size == 1 -> files.first() files.size == 1 -> files.first()
files.size > 1 -> FrameworkDescriptor( files.size > 1 -> FrameworkDescriptor(
fatFrameworksDir.resolve(group.targetName).resolve("${xcFrameworkName.get()}.framework"), fatFrameworksDir.resolve(group.targetName).resolve("$xcfName.framework"),
files.all { it.isStatic }, files.all { it.isStatic },
group.targets.first() //will be not used group.targets.first() //will be not used
) )