From 3f04bf119ec7d5a4f36a1f3efc35883a05c9c9fe Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Thu, 21 Mar 2019 11:39:17 +0700 Subject: [PATCH] Fat frameworks: Improve error messaging --- .../org/jetbrains/kotlin/gradle/tasks/FatFrameworkTask.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/FatFrameworkTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/FatFrameworkTask.kt index 8680bb6a16a..ad5e90f9e4d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/FatFrameworkTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/FatFrameworkTask.kt @@ -66,7 +66,7 @@ open class FatFrameworkTask: DefaultTask() { /** * 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 get() = archToFramework.values @@ -131,11 +131,13 @@ open class FatFrameworkTask: DefaultTask() { val konanTarget = it.target.konanTarget val arch = konanTarget.architecture 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." } 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 dependsOn(it.linkTask)