From 0edd0f1685d1a5116d8752bafc6c80d25086ad9e Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Tue, 2 May 2017 11:09:45 +0300
Subject: [PATCH 1/3] cleanup

---
 .../project/manage/AbstractModuleDataService.java      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
index 9fabeff65b72..9f56d1c16b97 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
@@ -79,7 +79,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
       return;
     }
 
-    final Collection<DataNode<E>> toCreate = filterExistingModules(toImport, modelsProvider, project);
+    final Collection<DataNode<E>> toCreate = filterExistingModules(toImport, modelsProvider);
     if (!toCreate.isEmpty()) {
       createModules(toCreate, modelsProvider, project);
     }
@@ -145,8 +145,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
 
   @NotNull
   private Collection<DataNode<E>> filterExistingModules(@NotNull Collection<DataNode<E>> modules,
-                                                        @NotNull IdeModifiableModelsProvider modelsProvider,
-                                                        @NotNull Project project) {
+                                                        @NotNull IdeModifiableModelsProvider modelsProvider) {
     Collection<DataNode<E>> result = ContainerUtilRt.newArrayList();
     for (DataNode<E> node : modules) {
       ModuleData moduleData = node.getData();
@@ -257,7 +256,6 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
             init();
           }
 
-          @Nullable
           @Override
           protected JComponent createCenterPanel() {
             return new JBScrollPane(content);
@@ -381,7 +379,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
     }
 
     if (LOG.isDebugEnabled()) {
-      final boolean changed = !ArrayUtil.equals(orderEntries, newOrder, (Comparator<OrderEntry>)(o1, o2) -> o1.compareTo(o2));
+      final boolean changed = !ArrayUtil.equals(orderEntries, newOrder, Comparator.naturalOrder());
       LOG.debug(String.format("rearrange status (%s): %s", modifiableRootModel.getModule(), changed ? "modified" : "not modified"));
     }
     modifiableRootModel.rearrangeOrderEntries(newOrder);
@@ -398,7 +396,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
         idx--;
       }
     }
-    return idx == -1 ? -1 : idx;
+    return idx;
   }
 
   private void setLanguageLevel(@NotNull ModifiableRootModel modifiableRootModel, E data) {

From a58a6c76edbd0378c8b4229fea5aa5a2acef765b Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Tue, 2 May 2017 11:21:14 +0300
Subject: [PATCH 2/3] Gradle: fix dependencies order

---
 .../service/project/BaseGradleProjectResolverExtension.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
index 847bfba8139a..9dc176e35e94 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
@@ -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);
       }
     }

From f0b09dd85ea97289505636f2448baff4912b1ae0 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Tue, 2 May 2017 11:29:41 +0300
Subject: [PATCH 3/3] Gradle: fix dependencies order

---
 build/dependencies/buildSrc/buildSrc.iml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/dependencies/buildSrc/buildSrc.iml b/build/dependencies/buildSrc/buildSrc.iml
index bac8a4f1f063..f194e8000d0f 100644
--- a/build/dependencies/buildSrc/buildSrc.iml
+++ b/build/dependencies/buildSrc/buildSrc.iml
@@ -23,6 +23,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Gradle: groovy-all-2.4.4">
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14-all/t7wfomcrmv8dmyii9c9waem8/gradle-2.14/lib/groovy-all-2.4.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library name="Gradle: gradle-installation-beacon-2.14">
         <CLASSES>
@@ -34,14 +43,5 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Gradle: groovy-all-2.4.4">
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14-all/t7wfomcrmv8dmyii9c9waem8/gradle-2.14/lib/groovy-all-2.4.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>
\ No newline at end of file