Minor: return map straight away
This commit is contained in:
@@ -57,8 +57,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
|
||||
SourceSetCachedFinder(project)
|
||||
)
|
||||
val dependencyMapper = KotlinDependencyMapper()
|
||||
val sourceSets = buildSourceSets(dependencyResolver, project, dependencyMapper) ?: return null
|
||||
val sourceSetMap = sourceSets.map { it.name to it }.toMap()
|
||||
val sourceSetMap = buildSourceSets(dependencyResolver, project, dependencyMapper) ?: return null
|
||||
val targets = buildTargets(projectTargets, sourceSetMap, dependencyResolver, project, dependencyMapper)
|
||||
computeSourceSetsDeferredInfo(sourceSetMap, targets, isHMPPEnabled(project), shouldCoerceRootSourceSetToCommon(project))
|
||||
val coroutinesState = getCoroutinesState(project)
|
||||
@@ -138,7 +137,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
|
||||
dependencyResolver: DependencyResolver,
|
||||
project: Project,
|
||||
dependencyMapper: KotlinDependencyMapper
|
||||
): Collection<KotlinSourceSetImpl>? {
|
||||
): Map<String, KotlinSourceSetImpl>? {
|
||||
val kotlinExt = project.extensions.findByName("kotlin") ?: 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 dependsOnCache = HashMap<String, Set<String>>()
|
||||
return allSourceSets.map { sourceSet ->
|
||||
KotlinSourceSetImpl(
|
||||
sourceSet.name to KotlinSourceSetImpl(
|
||||
sourceSet.name,
|
||||
sourceSet.languageSettings,
|
||||
sourceSet.sourceDirs,
|
||||
@@ -174,7 +173,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
|
||||
sourceSet.actualPlatforms as KotlinPlatformContainerImpl,
|
||||
sourceSet.isTestModule
|
||||
)
|
||||
}
|
||||
}.toMap()
|
||||
}
|
||||
|
||||
private fun buildAndroidDeps(classLoader: ClassLoader, project: Project): Map<String, List<Any>>? {
|
||||
|
||||
Reference in New Issue
Block a user