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

Improve performance of import of pure kotlin project: do not force all tasks creation

Browse Source 
#KT-34401 Fixed
This commit is contained in:
Andrey Uskov
2019-10-30 19:43:19 +03:00
committed by Yaroslav Chernyshev
parent 9d8abca195
commit 7ef136d142
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt
+16 -2
View File
@@ -9,6 +9,7 @@ import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.artifacts.Dependency
import org.gradle.api.artifacts.ProjectDependency
import org.jetbrains.kotlin.gradle.KotlinMPPGradleModelBuilder.Companion.getTargets
import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
import java.io.File
@@ -162,14 +163,27 @@ class KotlinGradleModelBuilder : AbstractKotlinGradleModelBuilder() {
}
}
override fun buildAll(modelName: String?, project: Project): KotlinGradleModelImpl {
override fun buildAll(modelName: String?, project: Project): KotlinGradleModelImpl? {
val kotlinPluginId = kotlinPluginIds.singleOrNull { project.plugins.findPlugin(it) != null }
val platformPluginId = platformPluginIds.singleOrNull { project.plugins.findPlugin(it) != null }
val targets = project.getTargets(includeSinglePlatform = true)
if (kotlinPluginId == null && platformPluginId == null && targets == null) {
return null
}
val compilerArgumentsBySourceSet = LinkedHashMap<String, ArgsInfo>()
val extraProperties = HashMap<String, KotlinTaskProperties>()
project.getAllTasks(false)[project]?.forEach { compileTask ->
val kotlinCompileTasks = if (targets != null) {
targets.flatMap { target -> KotlinMPPGradleModelBuilder.getCompilations(target) ?: emptyList() }
.mapNotNull { compilation -> KotlinMPPGradleModelBuilder.getCompileKotlinTaskName(project, compilation) }
} else {
project.getAllTasks(false)[project]?.filter { it.javaClass.name in kotlinCompileTaskClasses } ?: emptyList()
}
kotlinCompileTasks.forEach { compileTask ->
if (compileTask.javaClass.name !in kotlinCompileTaskClasses) return@forEach
val sourceSetName = compileTask.getSourceSetName()
idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt
+8 -3
View File
@@ -919,11 +919,16 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
}
}
fun Project.getTargets(): Collection<Named>? {
fun Project.getTargets(includeSinglePlatform: Boolean = false): Collection<Named>? {
val kotlinExt = project.extensions.findByName("kotlin") ?: return null
val getTargets = kotlinExt.javaClass.getMethodOrNull("getTargets") ?: return null
val getTargets = kotlinExt.javaClass.getMethodOrNull("getTargets")
if (getTargets == null && includeSinglePlatform) {
val getTarget = kotlinExt.javaClass.getMethodOrNull("getTarget")
val target = getTarget?.invoke(kotlinExt) as? Named
return if (target == null) emptyList() else listOf(target)
}
@Suppress("UNCHECKED_CAST")
return (getTargets.invoke(kotlinExt) as? NamedDomainObjectContainer<Named>)?.asMap?.values ?: emptyList()
return (getTargets?.invoke(kotlinExt) as? NamedDomainObjectContainer<Named>)?.asMap?.values ?: emptyList()
}
fun getCompilations(target: Named): Collection<Named>? {