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

Fat frameworks: Improve error messaging

Browse Source
This commit is contained in:
Ilya Matveev
2019-03-21 11:39:17 +07:00
parent 1c7866e81f
commit 3f04bf119e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/FatFrameworkTask.kt
+5 -3
View File
@@ -66,7 +66,7 @@ open class FatFrameworkTask: DefaultTask() {
/** /**
* A collection of frameworks used ot build the fat framework. * A collection of frameworks used ot build the fat framework.
*/ */
@get:Internal // We take it into account as an input in the inputFiles property. @get:Internal // We take it into account as an input in the inputFrameworkFiles property.
val frameworks: Collection<Framework> val frameworks: Collection<Framework>
get() = archToFramework.values get() = archToFramework.values
@@ -131,11 +131,13 @@ open class FatFrameworkTask: DefaultTask() {
val konanTarget = it.target.konanTarget val konanTarget = it.target.konanTarget
val arch = konanTarget.architecture val arch = konanTarget.architecture
require(konanTarget.family == Family.IOS) { require(konanTarget.family == Family.IOS) {
"Cannot add a framework with target '${konanTarget.visibleName}' in the fat framework: " + "Cannot add a framework with target '${konanTarget.visibleName}' to the fat framework: " +
"fat frameworks are available only for iOS binaries." "fat frameworks are available only for iOS binaries."
} }
require(!archToFramework.containsKey(arch)) { require(!archToFramework.containsKey(arch)) {
"This fat framework already has a binary for architecture `${arch.name.toLowerCase()}`" val alreadyAdded = archToFramework.getValue(arch)
"This fat framework already has a binary for architecture `${arch.name.toLowerCase()}` " +
"(${alreadyAdded.name} for target `${alreadyAdded.target.name}`)"
} }
archToFramework[arch] = it archToFramework[arch] = it
dependsOn(it.linkTask) dependsOn(it.linkTask)