From da06e49b19f36974b81cd5fa0a6ea41e3bf0c135 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 3 Oct 2018 18:43:39 +0300
Subject: [PATCH] MPP: Merge module dependencies if one of them has COMPILE
 scope

---
 idea/idea-gradle/src/org/jetbrains/kotlin/idea/utils.kt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/utils.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/utils.kt
index 02d0f51b372..6e40bbc74b4 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/utils.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/utils.kt
@@ -16,6 +16,12 @@ fun addModuleDependencyIfNeeded(
 ) {
     val dependencyScope = if (testScope) DependencyScope.TEST else DependencyScope.COMPILE
     val existingEntry = rootModel.findModuleOrderEntry(dependeeModule)
-    if (existingEntry != null && existingEntry.scope == dependencyScope) return
+    if (existingEntry != null) {
+        val existingScope = existingEntry.scope
+        if (existingScope == DependencyScope.COMPILE || existingScope == dependencyScope) return
+        if (dependencyScope == DependencyScope.COMPILE) {
+            rootModel.removeOrderEntry(existingEntry)
+        }
+    }
     rootModel.addModuleOrderEntry(dependeeModule).also { it.scope = dependencyScope }
 }
\ No newline at end of file