diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy index 23509b902ee8..a501415bdf48 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy @@ -136,7 +136,7 @@ class ExternalProjectBuilderImpl implements ModelBuilderService { Map> artifactsByConfiguration = new HashMap>() for (Map.Entry configurationEntry : configurationsByName.entrySet()) { Set files = configurationEntry.getValue().getAllArtifacts().getFiles().getFiles() - artifactsByConfiguration.put(configurationEntry.getKey(), files) + artifactsByConfiguration.put(configurationEntry.getKey(), new LinkedHashSet<>(files)) } externalProject.setArtifactsByConfiguration(artifactsByConfiguration) } diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModuleExtendedModelBuilderImpl.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModuleExtendedModelBuilderImpl.java index 11c2dbfdf1b0..81ff5204ad7c 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModuleExtendedModelBuilderImpl.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModuleExtendedModelBuilderImpl.java @@ -219,7 +219,7 @@ public class ModuleExtendedModelBuilderImpl implements ModelBuilderService { Map> artifactsByConfiguration = new HashMap>(); for (Map.Entry configurationEntry : configurationsByName.entrySet()) { Set files = configurationEntry.getValue().getAllArtifacts().getFiles().getFiles(); - artifactsByConfiguration.put(configurationEntry.getKey(), files); + artifactsByConfiguration.put(configurationEntry.getKey(), new LinkedHashSet(files)); } moduleVersionModel.setArtifactsByConfiguration(artifactsByConfiguration); diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImpl.groovy index 8ab7e46a5cd7..27e242930e18 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImpl.groovy @@ -69,8 +69,8 @@ class ScalaModelBuilderImpl implements ModelBuilderService { ScalaCompile scalaCompile = (ScalaCompile)task ScalaModelImpl scalaModel = new ScalaModelImpl() - scalaModel.scalaClasspath = scalaCompile.scalaClasspath.files - scalaModel.zincClasspath = scalaCompile.zincClasspath.files + scalaModel.scalaClasspath = new LinkedHashSet<>(scalaCompile.scalaClasspath.files) + scalaModel.zincClasspath = new LinkedHashSet<>(scalaCompile.zincClasspath.files) scalaModel.scalaCompileOptions = create(scalaCompile.scalaCompileOptions) scalaModel.targetCompatibility = scalaCompile.targetCompatibility scalaModel.sourceCompatibility = scalaCompile.sourceCompatibility diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/WarModelBuilderImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/WarModelBuilderImpl.groovy index 85534efefedc..f5256c74befc 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/WarModelBuilderImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/WarModelBuilderImpl.groovy @@ -90,7 +90,7 @@ class WarModelBuilderImpl implements ModelBuilderService { } } }) - warModel.classpath = warTask.classpath.files + warModel.classpath = new LinkedHashSet<>(warTask.classpath.files) } catch (Exception ignore) { ErrorMessageBuilder builderError = getErrorMessageBuilder(project, ignore)