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

[Test] Properly configure dependencies for common modules in ModuleStructureExtractor

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-29 11:25:19 +03:00
committed by TeamCityServer
parent 285ccf7583
commit 0608c50e27
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt
+5
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.test.services.impl
import org.jetbrains.kotlin.platform.CommonPlatforms import org.jetbrains.kotlin.platform.CommonPlatforms
import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.isCommon
import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.js.JsPlatforms
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.platform.konan.NativePlatforms import org.jetbrains.kotlin.platform.konan.NativePlatforms
@@ -156,6 +157,10 @@ class ModuleStructureExtractorImpl(
val (moduleName, dependencies, friends) = splitRawModuleStringToNameAndDependencies(values.joinToString(separator = " ")) val (moduleName, dependencies, friends) = splitRawModuleStringToNameAndDependencies(values.joinToString(separator = " "))
currentModuleName = moduleName currentModuleName = moduleName
dependencies.mapTo(dependenciesOfCurrentModule) { name -> dependencies.mapTo(dependenciesOfCurrentModule) { name ->
val dependentModule = modules.firstOrNull { it.name == name }
if (dependentModule?.targetPlatform.isCommon()) {
return@mapTo DependencyDescription(name, DependencyKind.Source, DependencyRelation.DependsOn)
}
val kind = defaultsProvider.defaultDependencyKind val kind = defaultsProvider.defaultDependencyKind
DependencyDescription(name, kind, DependencyRelation.Dependency) DependencyDescription(name, kind, DependencyRelation.Dependency)
} }