From 100ed06fd7a48b7769b944cf84947a652e663d3a Mon Sep 17 00:00:00 2001 From: Nikita Skvortsov Date: Tue, 15 May 2018 16:52:32 +0300 Subject: [PATCH] switch back to old dependency resolver impl --- .../gradle/tooling/builder/EarModelBuilderImpl.groovy | 4 +--- .../gradle/tooling/builder/ExternalProjectBuilderImpl.groovy | 4 +--- .../builder/ModelBuildScriptClasspathBuilderImpl.java | 5 +---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/EarModelBuilderImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/EarModelBuilderImpl.groovy index b6a9cb706e14..1140fe9ab4f6 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/EarModelBuilderImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/EarModelBuilderImpl.groovy @@ -31,7 +31,6 @@ import org.jetbrains.plugins.gradle.tooling.ModelBuilderService import org.jetbrains.plugins.gradle.tooling.internal.ear.EarConfigurationImpl import org.jetbrains.plugins.gradle.tooling.internal.ear.EarModelImpl import org.jetbrains.plugins.gradle.tooling.internal.ear.EarResourceImpl -import org.jetbrains.plugins.gradle.tooling.util.ArtifactsCollectionResolver import org.jetbrains.plugins.gradle.tooling.util.DependencyResolver import org.jetbrains.plugins.gradle.tooling.util.SourceSetCachedFinder import org.jetbrains.plugins.gradle.tooling.util.resolve.DependencyResolverImpl @@ -66,8 +65,7 @@ class EarModelBuilderImpl implements ModelBuilderService { def deployConfiguration = project.configurations.findByName(EarPlugin.DEPLOY_CONFIGURATION_NAME) def earlibConfiguration = project.configurations.findByName(EarPlugin.EARLIB_CONFIGURATION_NAME) - DependencyResolver dependencyResolver = is4OrBetter ? new ArtifactsCollectionResolver(project, false, false, false, mySourceSetFinder) - : new DependencyResolverImpl(project, false, false, false, mySourceSetFinder) + DependencyResolver dependencyResolver = new DependencyResolverImpl(project, false, false, false, mySourceSetFinder) def deployDependencies = dependencyResolver.resolveDependencies(deployConfiguration) def earlibDependencies = dependencyResolver.resolveDependencies(earlibConfiguration) 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 69083a7873c5..23509b902ee8 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 @@ -38,7 +38,6 @@ import org.jetbrains.annotations.Nullable import org.jetbrains.plugins.gradle.model.* import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder import org.jetbrains.plugins.gradle.tooling.ModelBuilderService -import org.jetbrains.plugins.gradle.tooling.util.ArtifactsCollectionResolver import org.jetbrains.plugins.gradle.tooling.util.SourceSetCachedFinder import org.jetbrains.plugins.gradle.tooling.util.resolve.DependencyResolverImpl @@ -417,8 +416,7 @@ class ExternalProjectBuilderImpl implements ModelBuilderService { } if(resolveSourceSetDependencies) { - def dependencies = is4OrBetter ? new ArtifactsCollectionResolver(project, isPreview, downloadJavadoc, downloadSources, sourceSetFinder).resolveDependencies(sourceSet) - : new DependencyResolverImpl(project, isPreview, downloadJavadoc, downloadSources, sourceSetFinder).resolveDependencies(sourceSet) + def dependencies = new DependencyResolverImpl(project, isPreview, downloadJavadoc, downloadSources, sourceSetFinder).resolveDependencies(sourceSet) externalSourceSet.dependencies.addAll(dependencies) } diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImpl.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImpl.java index 42f70d1d078c..4d53fe42dfbe 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImpl.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImpl.java @@ -27,7 +27,6 @@ import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder; import org.jetbrains.plugins.gradle.tooling.ModelBuilderService; import org.jetbrains.plugins.gradle.tooling.internal.BuildScriptClasspathModelImpl; import org.jetbrains.plugins.gradle.tooling.internal.ClasspathEntryModelImpl; -import org.jetbrains.plugins.gradle.tooling.util.ArtifactsCollectionResolver; import org.jetbrains.plugins.gradle.tooling.util.DependencyTraverser; import org.jetbrains.plugins.gradle.tooling.util.SourceSetCachedFinder; import org.jetbrains.plugins.gradle.tooling.util.resolve.DependencyResolverImpl; @@ -88,9 +87,7 @@ public class ModelBuildScriptClasspathBuilderImpl implements ModelBuilderService Configuration classpathConfiguration = project.getBuildscript().getConfigurations().findByName(CLASSPATH_CONFIGURATION_NAME); if (classpathConfiguration == null) return null; - Collection dependencies = - is40OrBetter ? new ArtifactsCollectionResolver(project, false, downloadJavadoc, downloadSources, mySourceSetFinder).resolveDependencies(classpathConfiguration) - : new DependencyResolverImpl(project, false, downloadJavadoc, downloadSources, mySourceSetFinder).resolveDependencies(classpathConfiguration); + Collection dependencies = new DependencyResolverImpl(project, false, downloadJavadoc, downloadSources, mySourceSetFinder).resolveDependencies(classpathConfiguration); for (ExternalDependency dependency : new DependencyTraverser(dependencies)) { if (dependency instanceof ExternalProjectDependency) {