keep predictable iteration order of dependencies

This commit is contained in:
Nikita Skvortsov
2018-05-23 09:55:03 +03:00
parent c59353239f
commit 91b46c79a3
2 changed files with 4 additions and 4 deletions
@@ -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) {
@@ -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();