From 17120bf2581a53e0bf5eff699ddb7264fbd5b517 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 12 Oct 2021 20:42:58 +0900 Subject: [PATCH] Pill: Fix Kotlin facet creation --- plugins/pill/pill-importer/src/ModelParser.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/pill/pill-importer/src/ModelParser.kt b/plugins/pill/pill-importer/src/ModelParser.kt index 064ee8daf63..1fb73321751 100644 --- a/plugins/pill/pill-importer/src/ModelParser.kt +++ b/plugins/pill/pill-importer/src/ModelParser.kt @@ -17,6 +17,7 @@ import org.gradle.api.file.SourceDirectorySet import org.gradle.api.internal.HasConvention import org.gradle.api.internal.file.copy.CopySpecInternal import org.gradle.api.internal.file.copy.SingleParentCopySpec +import org.gradle.api.provider.Property import org.gradle.jvm.tasks.Jar import org.gradle.kotlin.dsl.findByType import org.gradle.language.jvm.tasks.ProcessResources @@ -201,7 +202,7 @@ class ModelParser(private val variant: Variant, private val modulePrefix: String val kotlinTasksBySourceSet = project.tasks.names .filter { it.startsWith("compile") && it.endsWith("Kotlin") } .map { project.tasks.getByName(it) } - .associateBy { it.invokeInternal("getSourceSetName") } + .associateBy { (it.invokeInternal("getSourceSetName") as Property<*>).get() as String } val gradleSourceSets = project.sourceSets?.toList() ?: emptyList() val sourceSets = mutableListOf()