From 97039926f0ce79ef36513e9fff5368a7d10a4f2c Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Tue, 26 May 2020 13:12:49 +0300 Subject: [PATCH] Fixed import of transitive HMPP dependencies #KT-36792 Fixed --- .../src/KotlinMPPGradleModelBuilder.kt | 7 ++++--- .../src/KotlinMPPGradleModelBuilderBunch.kt | 10 ---------- .../src/KotlinMPPGradleModelBuilderBunch.kt.201 | 15 --------------- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt delete mode 100644 idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt.201 diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt index 9395970699b..5acb440fea9 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt @@ -616,8 +616,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { gradleCompilation.name, classifier )]?.dependencies?.map { dependencyMapper.getDependency(it) }?.filterNotNull() ?: emptySet() - - makeConfigurationNamesDefault(dependencyMapper) } } @@ -825,6 +823,8 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { ) { private val adjustmentMap = HashMap>() + private val EXTRA_DEFAULT_CONFIGURATION_NAMES = listOf("metadataApiElements") + private val projectDependencyTransformation = transformations.filter { it.projectPath != null }.associateBy { it.projectPath } @@ -899,7 +899,8 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { return adjustmentMap.getOrPut(dependency) { if (dependency !is ExternalProjectDependency) return@getOrPut adjustLibraryDependency(dependency, parentScope) - if (dependency.configurationName != Dependency.DEFAULT_CONFIGURATION) + if (dependency.configurationName != Dependency.DEFAULT_CONFIGURATION && + !EXTRA_DEFAULT_CONFIGURATION_NAMES.contains(dependency.configurationName)) return@getOrPut listOf(dependency) val artifacts = dependenciesByProjectPath[dependency.projectPath] ?: return@getOrPut listOf(dependency) val artifactConfiguration = artifacts.mapTo(LinkedHashSet()) { diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt deleted file mode 100644 index 74e6af2b2f8..00000000000 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle - -//BUNCH: 193 -fun makeConfigurationNamesDefault(dependencyMapper: KotlinDependencyMapper) { -} diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt.201 b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt.201 deleted file mode 100644 index 0f3f952252b..00000000000 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt.201 +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle - -import org.jetbrains.plugins.gradle.model.DefaultExternalProjectDependency - -//BUNCH: 193 -fun makeConfigurationNamesDefault(dependencyMapper: KotlinDependencyMapper) { - dependencyMapper.toDependencyMap().values.forEach { - (it as? DefaultExternalProjectDependency)?.configurationName = "default" - } -}