MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

do not walk project dependencies if not needed

Browse Source
This commit is contained in:
Nikita Skvortsov
2018-05-23 09:55:07 +03:00
parent fec01ebd83
commit e29125ee7b
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/ArtifactQueryResolver.java
+10 -9
View File
@@ -137,15 +137,17 @@ class ArtifactQueryResolver {
fileDeps.remove(artifact.getFile());
}
for (ProjectDependency dep : projectDepsToFilter) {
Set<File> depFiles = DependencyResolverImpl.getTargetConfiguration(dep).getAllArtifacts().getFiles().getFiles();
if (!fileDeps.isEmpty()) {
for (ProjectDependency dep : projectDepsToFilter) {
Set<File> depFiles = DependencyResolverImpl.getTargetConfiguration(dep).getAllArtifacts().getFiles().getFiles();
final Set<File> intersection = new LinkedHashSet<File>(Sets.intersection(fileDeps, depFiles));
if (!intersection.isEmpty()) {
DefaultFileCollectionDependency fileCollectionDependency = new DefaultFileCollectionDependency(intersection);
fileCollectionDependency.setScope(myScope);
result.add(fileCollectionDependency);
fileDeps.removeAll(intersection);
final Set<File> intersection = new LinkedHashSet<File>(Sets.intersection(fileDeps, depFiles));
if (!intersection.isEmpty()) {
DefaultFileCollectionDependency fileCollectionDependency = new DefaultFileCollectionDependency(intersection);
fileCollectionDependency.setScope(myScope);
result.add(fileCollectionDependency);
fileDeps.removeAll(intersection);
}
}
}
@@ -158,7 +160,6 @@ class ArtifactQueryResolver {
return result;
}
@NotNull
protected List<Class<? extends Artifact>> additionalArtifactsTypes() {
List<Class<? extends Artifact>> artifactTypes = new ArrayList<Class<? extends Artifact>>();