MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

gradle: fix merging of library and module dependencies

Browse Source
This commit is contained in:
Vladislav.Soroka
2015-12-10 18:58:25 +03:00
parent a3ab3c5afc
commit 65b5b7c840
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+2 -2
View File
@@ -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;
}
}