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

Improved performance non-MPP projects import

Browse Source 
#KT-32960 Fixed
This commit is contained in:
Andrey Uskov
2019-10-01 13:11:01 +03:00
parent 84aff5f630
commit f567df283e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt
+4 -2
View File
@@ -41,6 +41,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
} }
override fun buildAll(modelName: String, project: Project): Any? { override fun buildAll(modelName: String, project: Project): Any? {
val projectTargets = project.getTargets() ?: return null
val dependencyResolver = DependencyResolverImpl( val dependencyResolver = DependencyResolverImpl(
project, project,
false, false,
@@ -51,7 +52,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
val dependencyMapper = KotlinDependencyMapper() val dependencyMapper = KotlinDependencyMapper()
val sourceSets = buildSourceSets(dependencyResolver, project, dependencyMapper) ?: return null val sourceSets = buildSourceSets(dependencyResolver, project, dependencyMapper) ?: return null
val sourceSetMap = sourceSets.map { it.name to it }.toMap() val sourceSetMap = sourceSets.map { it.name to it }.toMap()
val targets = buildTargets(sourceSetMap, dependencyResolver, project, dependencyMapper) ?: return null val targets = buildTargets(projectTargets, sourceSetMap, dependencyResolver, project, dependencyMapper) ?: return null
computeSourceSetsDeferredInfo(sourceSetMap, targets, isHMPPEnabled(project)) computeSourceSetsDeferredInfo(sourceSetMap, targets, isHMPPEnabled(project))
val coroutinesState = getCoroutinesState(project) val coroutinesState = getCoroutinesState(project)
reportUnresolvedDependencies(targets) reportUnresolvedDependencies(targets)
@@ -232,12 +233,13 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
} }
private fun buildTargets( private fun buildTargets(
projectTargets: Collection<Named>,
sourceSetMap: Map<String, KotlinSourceSet>, sourceSetMap: Map<String, KotlinSourceSet>,
dependencyResolver: DependencyResolver, dependencyResolver: DependencyResolver,
project: Project, project: Project,
dependencyMapper: KotlinDependencyMapper dependencyMapper: KotlinDependencyMapper
): Collection<KotlinTarget>? { ): Collection<KotlinTarget>? {
return project.getTargets()?.mapNotNull { buildTarget(it, sourceSetMap, dependencyResolver, project, dependencyMapper) } return projectTargets.mapNotNull { buildTarget(it, sourceSetMap, dependencyResolver, project, dependencyMapper) }
} }
private operator fun Any?.get(methodName: String, vararg params: Any): Any? { private operator fun Any?.get(methodName: String, vararg params: Any): Any? {