From 29f3811bab61916b4658dfbaaa32654cbe7ff120 Mon Sep 17 00:00:00 2001 From: Kirill Shmakov Date: Thu, 10 Sep 2020 11:19:04 +0300 Subject: [PATCH] Update gradle tooling In response to a766369e7283d7b89a5ca2960460dc20365f919a --- .../src/KotlinMPPGradleModelBuilder.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt index 9465fd80f3f..edded4c3878 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt @@ -330,7 +330,11 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { val outputKind = linkTask["getOutputKind"]["name"] as? String ?: return null val konanTargetName = linkTask["getTarget"] as? String ?: error("No arch target found") val outputFile = (linkTask["getOutputFile"] as? Provider<*>)?.orNull as? File ?: return null - val compilationTarget = linkTask["getCompilation"]["getTarget"] + val compilation = if (linkTask["getCompilation"] is Provider<*>) + (linkTask["getCompilation"] as Provider<*>).get() + else + linkTask["getCompilation"] + val compilationTarget = compilation["getTarget"] val compilationTargetName = compilationTarget["getName"] as? String ?: return null val isTests = linkTask["getProcessTests"] as? Boolean ?: return null