From 91b46c79a39ecf4c467c3d60c70539cc4c4d2d70 Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Tue, 12 Dec 2017 11:09:39 +0300
Subject: [PATCH] keep predictable iteration order of dependencies

---
 .../gradle/tooling/util/ArtifactsCollectionResolver.java      | 4 ++--
 .../tooling/util/ScopedExternalDependenciesFactory.java       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ArtifactsCollectionResolver.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ArtifactsCollectionResolver.java
index c02d232491a1..6299a648e665 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ArtifactsCollectionResolver.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ArtifactsCollectionResolver.java
@@ -66,7 +66,7 @@ public class ArtifactsCollectionResolver extends DependencyResolverImpl implemen
     if (configuration == null) {
       return ExternalDepsResolutionResult.EMPTY;
     }
-    Collection<ExternalDependency> externalDeps = new HashSet<ExternalDependency>();
+    Collection<ExternalDependency> externalDeps = new LinkedHashSet<ExternalDependency>();
 
     ArtifactCollection resolvedArtifacts = configuration.getIncoming().artifactView(new Action<ArtifactView.ViewConfiguration>() {
       @Override
@@ -152,7 +152,7 @@ public class ArtifactsCollectionResolver extends DependencyResolverImpl implemen
 
   @NotNull
   private Collection<ModuleComponentIdentifier> collectModuleComponentIds(@NotNull ArtifactCollection artifacts) {
-    Collection<ModuleComponentIdentifier> moduleIds = new HashSet<ModuleComponentIdentifier>();
+    Collection<ModuleComponentIdentifier> moduleIds = new LinkedHashSet<ModuleComponentIdentifier>();
     for (ResolvedArtifactResult result : artifacts.getArtifacts()) {
       ComponentIdentifier componentIdentifier = result.getId().getComponentIdentifier();
       if (componentIdentifier instanceof ModuleComponentIdentifier) {
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ScopedExternalDependenciesFactory.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ScopedExternalDependenciesFactory.java
index d4dd0a5287a0..ec0e74f9bccb 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ScopedExternalDependenciesFactory.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ScopedExternalDependenciesFactory.java
@@ -35,7 +35,7 @@ class ScopedExternalDependenciesFactory {
   }
 
   public Collection<ExternalDependency> processUnresolvedDeps(@NotNull Iterable<UnresolvedDependencyResult> unresolvedDependencies) {
-    Collection<ExternalDependency> result = new HashSet<ExternalDependency>();
+    Collection<ExternalDependency> result = new LinkedHashSet<ExternalDependency>();
     for (UnresolvedDependencyResult dependency : unresolvedDependencies) {
       ComponentSelector attempted = dependency.getAttempted();
       if (attempted instanceof ModuleComponentSelector) {
@@ -57,7 +57,7 @@ class ScopedExternalDependenciesFactory {
                                                                             @NotNull Map<ModuleComponentIdentifier,
                                                                               Map<Class<? extends Artifact>,
                                                                                 Set<ResolvedArtifactResult>>> sourcesAndJavadocs) {
-    Collection<ExternalDependency> result = new HashSet<ExternalDependency>();
+    Collection<ExternalDependency> result = new LinkedHashSet<ExternalDependency>();
     for (ResolvedArtifactResult artifact : artifacts) {
       ComponentIdentifier identifier = artifact.getId().getComponentIdentifier();