From 0aef3680c1f12a39d05463872cd0ee92e99f19b1 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Fri, 11 Dec 2020 18:10:33 +0300 Subject: [PATCH] Remove useless function Looks like it has been broken by 40633768bc6c724bbf8cf2c5db4ee1cd8137f5f1 where 'KotlinCompilation.dependencies' switched its type from KotlinDependency (which is alias to org.jetbrains.plugins.gradle.model.ExternalDependency) to KotlinDependencyId (which is alias to Long), leading to safe-cast in the 'reportUnresolvedDependencies' to be always evaluated to 'null' Rationale for removing it completely instead of fixing: No one has noticed that this function has been broken + I haven't managed to find any user-visible behaviour it adds (tried fixing it and checking project similar to one from NewMultiplatformProjectImportingTest.testUnresolved, no difference for me). --- .../src/KotlinMPPGradleModelBuilder.kt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt index da49368ed68..8abcb6ee2be 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt @@ -62,7 +62,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { val targets = buildTargets(projectTargets, sourceSetMap, dependencyResolver, project, dependencyMapper) ?: return null computeSourceSetsDeferredInfo(sourceSetMap, targets, isHMPPEnabled(project), shouldCoerceRootSourceSetToCommon(project)) val coroutinesState = getCoroutinesState(project) - reportUnresolvedDependencies(targets) val kotlinNativeHome = KotlinNativeHomeEvaluator.getKotlinNativeHome(project) ?: NO_KOTLIN_NATIVE_HOME return KotlinMPPGradleModelImpl( filterOrphanSourceSets(sourceSetMap, targets, project), @@ -106,15 +105,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { return (project.findProperty("kotlin.native.enableDependencyPropagation") as? String)?.toBoolean() ?: true } - private fun reportUnresolvedDependencies(targets: Collection) { - targets.asSequence() - .flatMap { it.compilations.asSequence() } - .flatMap { it.dependencies.asSequence() } - .mapNotNull { (it as? UnresolvedExternalDependency)?.failureMessage } - .toSet() - .forEach { logger.warn(it) } - } - private fun getCoroutinesState(project: Project): String? { val kotlinExt = project.extensions.findByName("kotlin") ?: return null val getExperimental = kotlinExt.javaClass.getMethodOrNull("getExperimental") ?: return null