From aeed5fd5246fe68bb4b61baad87c4d7da8983f49 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Mon, 6 Feb 2017 11:50:43 +0300
Subject: [PATCH] gradle: runtime dependencies resolve fixed

---
 .../plugins/gradle/tooling/util/DependencyResolverImpl.groovy | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy
index c01519266c05..c9dcb4f6f8b8 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy
@@ -231,6 +231,7 @@ class DependencyResolverImpl implements DependencyResolver {
       }
     }
 
+    Multimap<Object, ExternalDependency> resolvedRuntimeMap = ArrayListMultimap.create()
     new DependencyTraverser(runtimeDependencies).each {
       Collection<ExternalDependency> dependencies = resolvedMap.get(resolve(it))
       if (dependencies && !dependencies.isEmpty() && it.dependencies.isEmpty()) {
@@ -239,9 +240,10 @@ class DependencyResolverImpl implements DependencyResolver {
         dependencies.each {((AbstractExternalDependency)it).scope = compileScope}
       }
       else {
-        resolvedMap.put(resolve(it), it)
+        resolvedRuntimeMap.put(resolve(it), it)
       }
     }
+    resolvedMap.putAll(resolvedRuntimeMap)
 
     result.addAll(compileDependencies)
     result.addAll(runtimeDependencies)