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

IDEA-99915 Gradle: mismatched (yellow) dependencies multiply on changing dependencies list

Browse Source 
Don't process old changes as new
This commit is contained in:
Denis.Zhdanov
2013-01-30 12:58:09 +04:00
parent 6bdb1996c1
commit a138692d89
2 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureTreeModel.java
+2 -2
View File
@@ -125,7 +125,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
@Override
public void run() {
Collection<GradleProjectStructureChange> obsoleteChangesToUse = ContainerUtil.subtract(oldChanges, currentChanges);
Collection<GradleProjectStructureChange> currentChangesToUse = currentChanges;
Collection<GradleProjectStructureChange> currentChangesToUse = ContainerUtil.subtract(currentChanges, oldChanges);
if (myChangesComparator != null) {
obsoleteChangesToUse = sort(obsoleteChangesToUse, myChangesComparator);
currentChangesToUse = sort(currentChangesToUse, myChangesComparator);
@@ -225,7 +225,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
GradleProject project = myChangesModel.getGradleProject();
if (project != null) {
GradleChangesCalculationContext context = myChangesModel.getCurrentChangesContext(project);
processChanges(context.getKnownChanges(), context.getCurrentChanges());
processChanges(Collections.<GradleProjectStructureChange>emptyList(), context.getCurrentChanges());
filterNodes(root);
}
}
plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleOutdatedLibraryVersionTest.groovy
+63
View File
@@ -133,4 +133,67 @@ class GradleOutdatedLibraryVersionTest extends AbstractGradleTest {
dependencies {
'lib (1 -> 2)' ('outdated') } } } }
}
@Test
void "gradle-local library after outdated library"() {
init(
gradle: {
project {
module {
dependencies {
library('lib1-1') } } } },
intellij: {
project {
module {
dependencies {
library('lib1-1') } } } } )
checkChanges {}
setState(gradle: {
project {
module {
dependencies {
library('lib1-2')} } } } )
checkChanges {
libraryVersion (
name: 'lib1',
gradleVersion: '2',
gradleLibraryId: findLibraryId('lib1-2', true),
ideVersion: '1',
ideLibraryId: findLibraryId('lib1-1', false)
)
}
checkTree {
project {
module {
dependencies {
'lib1 (1 -> 2)' ('outdated')} } } }
setState(gradle: {
project {
module {
dependencies {
library('lib1-2')
library('lib2-1') } } } } )
checkChanges {
libraryVersion (
name: 'lib1',
gradleVersion: '2',
gradleLibraryId: findLibraryId('lib1-2', true),
ideVersion: '1',
ideLibraryId: findLibraryId('lib1-1', false)
)
presence {
library(gradle: gradle.libraryDependencies.values().flatten().findAll { it.name == "lib2-1" })
}
}
checkTree {
project {
module {
dependencies {
'lib2-1' ('gradle')
'lib1 (1 -> 2)' ('outdated')
} } } }
}
}