From 65b5b7c840da1fa795108cac3df7e7b1c331bec7 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Thu, 10 Dec 2015 18:55:33 +0300
Subject: [PATCH] gradle: fix merging of library and module dependencies

---
 .../plugins/gradle/service/project/GradleProjectResolver.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
index f10eb2a2eedb..438db5a058b8 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
@@ -412,7 +412,7 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
           ContainerUtil.addAllNotNull(compileSet,
                                       moduleData.getCompileOutputPath(ExternalSystemSourceType.SOURCE),
                                       moduleData.getCompileOutputPath(ExternalSystemSourceType.RESOURCE));
-          if (!compileSet.isEmpty() && libraryPaths.containsAll(compileSet)) {
+          if (!compileSet.isEmpty() && ContainerUtil.intersects(libraryPaths, compileSet)) {
             targetModuleOutputPaths = compileSet;
           }
           else {
@@ -420,7 +420,7 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
             ContainerUtil.addAllNotNull(testSet,
                                         moduleData.getCompileOutputPath(ExternalSystemSourceType.TEST),
                                         moduleData.getCompileOutputPath(ExternalSystemSourceType.TEST_RESOURCE));
-            if (compileSet.isEmpty() && libraryPaths.containsAll(testSet)) {
+            if (compileSet.isEmpty() && ContainerUtil.intersects(libraryPaths, testSet)) {
               targetModuleOutputPaths = testSet;
             }
           }