From e2748a5f157e6df9897c95d2cfd1509e32582094 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Wed, 8 Jun 2016 13:52:37 +0300 Subject: [PATCH] IDEA-157177 IDEA Ultimate 2016.1.3 cannot resolve transitive dependencies in multi module gradle project --- .../service/project/manage/LibraryDependencyDataService.java | 2 ++ .../model/impl/JpsGradleDependenciesEnumerationHandler.java | 2 +- .../plugins/gradle/execution/GradleOrderEnumeratorHandler.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java index e9b09a6072cb..f5320159d237 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java @@ -203,6 +203,8 @@ public class LibraryDependencyDataService extends AbstractDependencyDataService< if (existing != null) { toImport.remove(existing); orderEntryDataMap.put(entry, existing); + libraryOrderEntry.setExported(existing.isExported()); + libraryOrderEntry.setScope(existing.getScope()); } else if (!hasUnresolvedLibraries) { // There is a possible case that a project has been successfully imported from external model and after diff --git a/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/model/impl/JpsGradleDependenciesEnumerationHandler.java b/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/model/impl/JpsGradleDependenciesEnumerationHandler.java index c5091cecf0e5..7d75e06c4749 100644 --- a/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/model/impl/JpsGradleDependenciesEnumerationHandler.java +++ b/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/model/impl/JpsGradleDependenciesEnumerationHandler.java @@ -57,7 +57,7 @@ public class JpsGradleDependenciesEnumerationHandler extends JpsJavaDependencies @Override public boolean shouldProcessDependenciesRecursively() { - return false; + return !myResolveModulePerSourceSet; } public static class GradleFactory extends Factory { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java index bcd4ff0fd1c4..ea14cd9ae88e 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java @@ -86,7 +86,7 @@ public class GradleOrderEnumeratorHandler extends OrderEnumerationHandler { @Override public boolean shouldProcessDependenciesRecursively() { - return false; + return !myResolveModulePerSourceSet; } @Override