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 dependencies order

Browse Source
This commit is contained in:
Vladislav.Soroka
2017-05-02 11:22:00 +03:00
parent 0edd0f1685
commit a58a6c76ed
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+4 -1
View File
@@ -473,7 +473,8 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
if (dependencies == null) return;
List<String> orphanModules = ContainerUtil.newArrayList();
for (IdeaDependency dependency : dependencies) {
for (int i = 0; i < dependencies.size(); i++) {
IdeaDependency dependency = dependencies.get(i);
if (dependency == null) {
continue;
}
@@ -485,6 +486,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
if (scope != null) {
d.setScope(scope);
}
d.setOrder(i);
ideModule.createChild(ProjectKeys.MODULE_DEPENDENCY, d);
ModuleData targetModule = d.getTarget();
if (targetModule.getId().isEmpty() && targetModule.getLinkedExternalProjectPath().isEmpty()) {
@@ -497,6 +499,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
if (scope != null) {
d.setScope(scope);
}
d.setOrder(i);
ideModule.createChild(ProjectKeys.LIBRARY_DEPENDENCY, d);
}
}