mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IDEA-76142: Gradle support - cannot update IDEA projects once one of build.gradle files changes
Showing module dependency changes as well
This commit is contained in:
+8
-5
@@ -31,10 +31,13 @@ import java.util.Collection;
|
||||
*/
|
||||
public class GradleConflictControlFactory {
|
||||
|
||||
@NotNull private final GradleLibraryDependencyConflictControlFactory myLibraryFactory;
|
||||
@NotNull private final GradleLibraryDependencyConflictControlFactory myLibraryDependencyFactory;
|
||||
@NotNull private final GradleCommonDependencyConflictControlFactory myCommonDependencyFactory;
|
||||
|
||||
public GradleConflictControlFactory(@NotNull GradleLibraryDependencyConflictControlFactory factory) {
|
||||
myLibraryFactory = factory;
|
||||
public GradleConflictControlFactory(@NotNull GradleLibraryDependencyConflictControlFactory libraryFactory,
|
||||
@NotNull GradleCommonDependencyConflictControlFactory commonDependencyFactory) {
|
||||
myLibraryDependencyFactory = libraryFactory;
|
||||
myCommonDependencyFactory = commonDependencyFactory;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -63,12 +66,12 @@ public class GradleConflictControlFactory {
|
||||
|
||||
@Override
|
||||
public void visit(@NotNull LibraryOrderEntry libraryDependency) {
|
||||
result.set(myLibraryFactory.getControl(libraryDependency, changes));
|
||||
result.set(myLibraryDependencyFactory.getControl(libraryDependency, changes));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visit(@NotNull ModuleOrderEntry moduleDependency) {
|
||||
|
||||
result.set(myCommonDependencyFactory.getControl(moduleDependency, changes));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user