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

check for dependencies without artifacts as well IDEA-181187

Browse Source 
Fixes KT-30459 Kotlin MPP plugin uses this API to create a dependency that has no artifacts at all
This commit is contained in:
Nikita Skvortsov
2019-03-20 15:10:55 +03:00
parent aaf4bf8c3c
commit 7ef37cdcd7
1 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java
+35 -13
View File
@@ -534,19 +534,6 @@ public class GradleProjectResolverUtil {
DataNode<? extends ExternalEntityData> depOwnerDataNode = null;
if (mergedDependency instanceof ExternalProjectDependency) {
class ProjectDependencyInfo {
@NotNull final ModuleData myModuleData;
@Nullable final ExternalSourceSet mySourceSet;
final Collection<File> dependencyArtifacts;
ProjectDependencyInfo(@NotNull ModuleData moduleData,
@Nullable ExternalSourceSet sourceSet,
Collection<File> dependencyArtifacts) {
this.myModuleData = moduleData;
this.mySourceSet = sourceSet;
this.dependencyArtifacts = dependencyArtifacts;
}
}
final ExternalProjectDependency projectDependency = (ExternalProjectDependency)mergedDependency;
@@ -583,6 +570,19 @@ public class GradleProjectResolverUtil {
projectDependencyInfos.add(new ProjectDependencyInfo(
entry.getKey().first.getData(), entry.getKey().second, entry.getValue()));
}
String moduleIdFromDependency = getModuleId(projectDependency);
Pair<DataNode<GradleSourceSetData>, ExternalSourceSet> projectPairFromMap = sourceSetMap.get(moduleIdFromDependency);
if (projectPairFromMap != null) {
if (doesNotContainDependencyOn(projectDependencyInfos, projectPairFromMap.first.getData())) {
final Collection<File> artifacts = projectDependency.getProjectDependencyArtifacts();
artifacts.removeAll(collectProcessedArtifacts(projectDependencyInfos));
projectDependencyInfos.add(new ProjectDependencyInfo(projectPairFromMap.first.getData(),
projectPairFromMap.second,
artifacts));
}
}
}
if (projectDependencyInfos.isEmpty()) {
@@ -710,6 +710,14 @@ public class GradleProjectResolverUtil {
}
}
private static Collection<File> collectProcessedArtifacts(Collection<ProjectDependencyInfo> infos) {
return infos.stream().flatMap((info) -> info.dependencyArtifacts.stream()).collect(Collectors.toSet());
}
private static boolean doesNotContainDependencyOn(Collection<ProjectDependencyInfo> infos, GradleSourceSetData data) {
return infos.stream().noneMatch((info) -> info.myModuleData.equals(data));
}
public static boolean linkProjectLibrary(@Nullable DataNode<ProjectData> ideProject, @NotNull final LibraryData library) {
if (ideProject == null) return false;
@@ -767,4 +775,18 @@ public class GradleProjectResolverUtil {
return name.equals(taskName) || name.equals(taskPath);
});
}
static class ProjectDependencyInfo {
@NotNull final ModuleData myModuleData;
@Nullable final ExternalSourceSet mySourceSet;
final Collection<File> dependencyArtifacts;
ProjectDependencyInfo(@NotNull ModuleData moduleData,
@Nullable ExternalSourceSet sourceSet,
Collection<File> dependencyArtifacts) {
this.myModuleData = moduleData;
this.mySourceSet = sourceSet;
this.dependencyArtifacts = dependencyArtifacts;
}
}
}