From 046f44d34bc49c054607e1e689d447b6b6c1f2e4 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 23 Nov 2015 18:53:18 +0300 Subject: [PATCH] gradle: fix file dependencies resolve --- .../gradle/tooling/util/DependencyResolverImpl.groovy | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy index 648bc6a8ff6a..7973570a5b89 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy @@ -128,6 +128,16 @@ class DependencyResolverImpl implements DependencyResolver { componentResults.each { componentResultsMap.put(it.id, it) } ResolutionResult resolutionResult = configuration.incoming.resolutionResult + def fileDeps = new LinkedHashSet(configuration.incoming.files.files); + artifactMap + artifactMap.values().each { + fileDeps.remove(it.file) + } + fileDeps.each { + def fileCollectionDependency = new DefaultFileCollectionDependency([it]) + fileCollectionDependency.scope = scope + result.add(fileCollectionDependency) + } result.addAll(transform(Lists.newArrayList(), resolutionResult.root.dependencies, artifactMap, componentResultsMap, scope)) } }