rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-21 15:54:39 +01:00
Code Issues Releases Activity

When resolving dependencies consider installed contributions first

Browse Source 
Consider a case where the user decides to install a library `A` that
depends on library `B` and `B` is not up-to-date (i.e. is installed a
version that is not the latest), then the user is asked to "install"
both libraries `A` and `B`, effectively upgrading `B`.

With this change the already installed library `B` is left untouched
and not displayed in the missing dependencies.
This commit is contained in:
Cristian Maglie 2017-02-20 13:41:25 +01:00 committed by Martino Facchin
parent ed81292b14
commit 492553cde0
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java
View File

@ -138,13 +138,20 @@ public abstract class LibrariesIndex {
continue; continue;
} }
// Pick the latest version among possible deps // Pick the installed version if available
ContributedLibrary last = possibleDeps.stream() ContributedLibrary selected;
.reduce((a, b) -> b.isBefore(a) ? a : b).get(); Optional<ContributedLibrary> installed = possibleDeps.stream()
.filter(l -> l.getInstalledLibrary().isPresent()).findAny();
if (installed.isPresent()) {
selected = installed.get();
} else {
// otherwise pick the latest version
selected = possibleDeps.stream().reduce((a, b) -> b.isBefore(a) ? a : b).get();
}
// Add dependecy to the solution and process recursively // Add dependency to the solution and process recursively
solution.add(last); solution.add(selected);
if (!resolveDependeciesOf(solution, last)) { if (!resolveDependeciesOf(solution, selected)) {
return false; return false;
} }
} }