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

Pill: Fix Kotlin facet creation

Browse Source
This commit is contained in:
Yan Zhulanow
2021-10-12 20:42:58 +09:00
committed by TeamCityServer
parent 099a44283f
commit 17120bf258
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pill/pill-importer/src/ModelParser.kt
+2 -1
View File
@@ -17,6 +17,7 @@ import org.gradle.api.file.SourceDirectorySet
import org.gradle.api.internal.HasConvention import org.gradle.api.internal.HasConvention
import org.gradle.api.internal.file.copy.CopySpecInternal import org.gradle.api.internal.file.copy.CopySpecInternal
import org.gradle.api.internal.file.copy.SingleParentCopySpec import org.gradle.api.internal.file.copy.SingleParentCopySpec
import org.gradle.api.provider.Property
import org.gradle.jvm.tasks.Jar import org.gradle.jvm.tasks.Jar
import org.gradle.kotlin.dsl.findByType import org.gradle.kotlin.dsl.findByType
import org.gradle.language.jvm.tasks.ProcessResources 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 val kotlinTasksBySourceSet = project.tasks.names
.filter { it.startsWith("compile") && it.endsWith("Kotlin") } .filter { it.startsWith("compile") && it.endsWith("Kotlin") }
.map { project.tasks.getByName(it) } .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 gradleSourceSets = project.sourceSets?.toList() ?: emptyList()
val sourceSets = mutableListOf<PSourceSet>() val sourceSets = mutableListOf<PSourceSet>()