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

Minor: return map straight away

Browse Source
This commit is contained in:
Dmitry Savvinov
2020-12-14 16:32:09 +03:00
parent cf2bd75a73
commit f87aa4612b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt
+4 -5
View File
@@ -57,8 +57,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
SourceSetCachedFinder(project) SourceSetCachedFinder(project)
) )
val dependencyMapper = KotlinDependencyMapper() val dependencyMapper = KotlinDependencyMapper()
val sourceSets = buildSourceSets(dependencyResolver, project, dependencyMapper) ?: return null val sourceSetMap = buildSourceSets(dependencyResolver, project, dependencyMapper) ?: return null
val sourceSetMap = sourceSets.map { it.name to it }.toMap()
val targets = buildTargets(projectTargets, sourceSetMap, dependencyResolver, project, dependencyMapper) val targets = buildTargets(projectTargets, sourceSetMap, dependencyResolver, project, dependencyMapper)
computeSourceSetsDeferredInfo(sourceSetMap, targets, isHMPPEnabled(project), shouldCoerceRootSourceSetToCommon(project)) computeSourceSetsDeferredInfo(sourceSetMap, targets, isHMPPEnabled(project), shouldCoerceRootSourceSetToCommon(project))
val coroutinesState = getCoroutinesState(project) val coroutinesState = getCoroutinesState(project)
@@ -138,7 +137,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
dependencyResolver: DependencyResolver, dependencyResolver: DependencyResolver,
project: Project, project: Project,
dependencyMapper: KotlinDependencyMapper dependencyMapper: KotlinDependencyMapper
): Collection<KotlinSourceSetImpl>? { ): Map<String, KotlinSourceSetImpl>? {
val kotlinExt = project.extensions.findByName("kotlin") ?: return null val kotlinExt = project.extensions.findByName("kotlin") ?: return null
val getSourceSets = kotlinExt.javaClass.getMethodOrNull("getSourceSets") ?: return null val getSourceSets = kotlinExt.javaClass.getMethodOrNull("getSourceSets") ?: return null
@@ -164,7 +163,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
val map = allSourceSets.map { it.name to it }.toMap() val map = allSourceSets.map { it.name to it }.toMap()
val dependsOnCache = HashMap<String, Set<String>>() val dependsOnCache = HashMap<String, Set<String>>()
return allSourceSets.map { sourceSet -> return allSourceSets.map { sourceSet ->
KotlinSourceSetImpl( sourceSet.name to KotlinSourceSetImpl(
sourceSet.name, sourceSet.name,
sourceSet.languageSettings, sourceSet.languageSettings,
sourceSet.sourceDirs, sourceSet.sourceDirs,
@@ -174,7 +173,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
sourceSet.actualPlatforms as KotlinPlatformContainerImpl, sourceSet.actualPlatforms as KotlinPlatformContainerImpl,
sourceSet.isTestModule sourceSet.isTestModule
) )
} }.toMap()
} }
private fun buildAndroidDeps(classLoader: ClassLoader, project: Project): Map<String, List<Any>>? { private fun buildAndroidDeps(classLoader: ClassLoader, project: Project): Map<String, List<Any>>? {