8000 Library manager: dependency resolver by cmaglie · Pull Request #6004 · arduino/Arduino · GitHub
[go: up one dir, main page]
Skip to content

Library manager: dependency resolver #6004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Library manager: dependency resolver #6004

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
010c2da
Added collector to LibraryList
cmaglie Jan 30, 2017
a6fb0b2
Improved lib equality check
cmaglie Jan 25, 2017
3a9cc94
Renamed ContributedLibraryReference to ContributedLibraryDependency
cmaglie Jan 25, 2017
9361087
Added helper methods to compare versions
cmaglie Jan 26, 2017
1dde868
Added library-dependency resolver
cmaglie Jan 26, 2017
471aff5
Lib installer: factored out method to perform lib installation
cmaglie Jan 26, 2017
11baf23
LibraryInstaller now autodetects if a library is being replaced
cmaglie Jan 26, 2017
bae6bd7
Now libraries are installed with all the dependencies
cmaglie Jan 26, 2017
fb00f02
Added library dependencies install dialog
cmaglie Jan 30, 2017
abe867f
When resolving dependencies consider installed contributions first
cmaglie Feb 20, 2017
20ba6ff
TO BE REMOVED: helps in debugging
cmaglie Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Renamed ContributedLibraryReference to ContributedLibraryDependency
  • Loading branch information
@cmaglie
cmaglie committed Feb 20, 2017
commit 3a9cc94c285e3452bd1b29bcd66f553e452572e6
4 changes: 2 additions & 2 deletions arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
E 10000 xpand Up @@ -61,7 +61,7 @@ public abstract class ContributedLibrary extends DownloadableContribution {

public abstract List<String> getTypes();

public abstract List<ContributedLibraryReference> getRequires();
public abstract List<ContributedLibraryDependency> getRequires();

public static final Comparator<ContributedLibrary> CASE_INSENSITIVE_ORDER = (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName());

Expand Down Expand Up @@ -117,7 +117,7 @@ public String info() {
res += "\n";
res += " requires :\n";
if (getRequires() != null)
for (ContributedLibraryReference r : getRequires()) {
for (ContributedLibraryDependency r : getRequires()) {
res += " " + r;
}
res += "\n";
Expand Down
8 changes: 3 additions & 5 deletions ...ibraries/ContributedLibraryReference.java → ...braries/ContributedLibraryDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,14 @@

package cc.arduino.contributions.libraries;

public abstract class ContributedLibraryReference {
public abstract class ContributedLibraryDependency {

public abstract String getName();

public abstract String getMaintainer();

public abstract String getVersion();
public abstract String getVersionRequired();

@Override
public String toString() {
return getName() + " " + getVersion() + " (" + getMaintainer() + ")";
return getName() + " " + getVersionRequired();
}
}
4 changes: 2 additions & 2 deletions arduino-core/src/processing/app/packages/UserLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

import cc.arduino.Constants;
import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.contributions.libraries.ContributedLibraryReference;
import cc.arduino.contributions.libraries.ContributedLibraryDependency;
import processing.app.helpers.PreferencesMap;

import java.io.File;
Expand Down Expand Up @@ -244,7 +244,7 @@ public String getArchiveFileName() {
}

@Override
public List<ContributedLibraryReference> getRequires() {
public List<ContributedLibraryDependency> getRequires() {
return null;
}

Expand Down
0