From d7445dc59ce3e4769da509541d45b48ac892c0a2 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Wed, 22 Dec 2021 17:22:13 +0100 Subject: [PATCH] Revert "[MPP][Test] MPPCompositeMode: Include transitive dependsOn dependencies" This reverts commit a6bc8807e5020185adaddf1bc3648b3764b4e71d. --- .../classic/MultiplatformAnalysisConfiguration.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/MultiplatformAnalysisConfiguration.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/MultiplatformAnalysisConfiguration.kt index 322428a24a9..66813df5f2d 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/MultiplatformAnalysisConfiguration.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/MultiplatformAnalysisConfiguration.kt @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.resolve.multiplatform.isCommonSource import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE import org.jetbrains.kotlin.test.model.* import org.jetbrains.kotlin.test.services.* -import org.jetbrains.kotlin.types.typeUtil.closure internal fun MultiplatformAnalysisConfiguration(testServices: TestServices): MultiplatformAnalysisConfiguration { return if (testServices.moduleStructure.allDirectives.contains(ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE)) { @@ -122,12 +121,7 @@ internal class MultiplatformCompositeAnalysisConfiguration( } override fun getDependencyDescriptors(module: TestModule): List { - // Transitive dependsOn descriptors should also be returned as dependencies - val allDependsOnDependencies = module.dependsOnDependencies.closure(preserveOrder = true) { dependsOnDependency -> - dependencyProvider.getTestModule(dependsOnDependency.moduleName).dependsOnDependencies - } - val allDependencies = (module.allDependencies + allDependsOnDependencies).distinct() - return getDescriptors(allDependencies, dependencyProvider, moduleDescriptorProvider) + return getDescriptors(module.allDependencies, dependencyProvider, moduleDescriptorProvider) } override fun getDependsOnDescriptors(module: TestModule): List {