diff --git a/app/src/cc/arduino/contributions/libraries/ui/MultiLibraryInstallDialog.java b/app/src/cc/arduino/contributions/libraries/ui/MultiLibraryInstallDialog.java
index 806660a47..4c6e8a4df 100644
--- a/app/src/cc/arduino/contributions/libraries/ui/MultiLibraryInstallDialog.java
+++ b/app/src/cc/arduino/contributions/libraries/ui/MultiLibraryInstallDialog.java
@@ -52,7 +52,6 @@ import javax.swing.text.html.HTMLDocument;
import javax.swing.text.html.StyleSheet;
import cc.arduino.contributions.libraries.ContributedLibraryRelease;
-import cc.arduino.contributions.libraries.UnavailableContributedLibrary;
import processing.app.Base;
import processing.app.Theme;
@@ -120,8 +119,6 @@ public class MultiLibraryInstallDialog extends JDialog {
continue;
if (l.getInstalledLibrary().isPresent())
continue;
- if (l instanceof UnavailableContributedLibrary)
- continue;
desc += format("- {0}
", l.getName());
}
desc += "
";
diff --git a/arduino-core/src/cc/arduino/cli/commands/Compile.java b/arduino-core/src/cc/arduino/cli/commands/Compile.java
index b1502495e..e183b4f42 100644
--- a/arduino-core/src/cc/arduino/cli/commands/Compile.java
+++ b/arduino-core/src/cc/arduino/cli/commands/Compile.java
@@ -296,6 +296,16 @@ public final class Compile {
*/
com.google.protobuf.ByteString
getLibrariesBytes(int index);
+
+ /**
+ *
+ * Optimize compile output for debug, not for release
+ *
+ *
+ * bool optimizeForDebug = 16;
+ * @return The optimizeForDebug.
+ */
+ boolean getOptimizeForDebug();
}
/**
* Protobuf type {@code cc.arduino.cli.commands.CompileReq}
@@ -450,6 +460,11 @@ public final class Compile {
libraries_.add(s);
break;
}
+ case 128: {
+
+ optimizeForDebug_ = input.readBool();
+ break;
+ }
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -983,6 +998,20 @@ public final class Compile {
return libraries_.getByteString(index);
}
+ public static final int OPTIMIZEFORDEBUG_FIELD_NUMBER = 16;
+ private boolean optimizeForDebug_;
+ /**
+ *
+ * Optimize compile output for debug, not for release
+ *
+ *
+ * bool optimizeForDebug = 16;
+ * @return The optimizeForDebug.
+ */
+ public boolean getOptimizeForDebug() {
+ return optimizeForDebug_;
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -1042,6 +1071,9 @@ public final class Compile {
for (int i = 0; i < libraries_.size(); i++) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 15, libraries_.getRaw(i));
}
+ if (optimizeForDebug_ != false) {
+ output.writeBool(16, optimizeForDebug_);
+ }
unknownFields.writeTo(output);
}
@@ -1112,6 +1144,10 @@ public final class Compile {
size += dataSize;
size += 1 * getLibrariesList().size();
}
+ if (optimizeForDebug_ != false) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(16, optimizeForDebug_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -1160,6 +1196,8 @@ public final class Compile {
!= other.getJobs()) return false;
if (!getLibrariesList()
.equals(other.getLibrariesList())) return false;
+ if (getOptimizeForDebug()
+ != other.getOptimizeForDebug()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -1211,6 +1249,9 @@ public final class Compile {
hash = (37 * hash) + LIBRARIES_FIELD_NUMBER;
hash = (53 * hash) + getLibrariesList().hashCode();
}
+ hash = (37 * hash) + OPTIMIZEFORDEBUG_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+ getOptimizeForDebug());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -1378,6 +1419,8 @@ public final class Compile {
libraries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000002);
+ optimizeForDebug_ = false;
+
return this;
}
@@ -1432,6 +1475,7 @@ public final class Compile {
bitField0_ = (bitField0_ & ~0x00000002);
}
result.libraries_ = libraries_;
+ result.optimizeForDebug_ = optimizeForDebug_;
onBuilt();
return result;
}
@@ -1546,6 +1590,9 @@ public final class Compile {
}
onChanged();
}
+ if (other.getOptimizeForDebug() != false) {
+ setOptimizeForDebug(other.getOptimizeForDebug());
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -2848,6 +2895,48 @@ public final class Compile {
onChanged();
return this;
}
+
+ private boolean optimizeForDebug_ ;
+ /**
+ *
+ * Optimize compile output for debug, not for release
+ *
+ *
+ * bool optimizeForDebug = 16;
+ * @return The optimizeForDebug.
+ */
+ public boolean getOptimizeForDebug() {
+ return optimizeForDebug_;
+ }
+ /**
+ *
+ * Optimize compile output for debug, not for release
+ *
+ *
+ * bool optimizeForDebug = 16;
+ * @param value The optimizeForDebug to set.
+ * @return This builder for chaining.
+ */
+ public Builder setOptimizeForDebug(boolean value) {
+
+ optimizeForDebug_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * Optimize compile output for debug, not for release
+ *
+ *
+ * bool optimizeForDebug = 16;
+ * @return This builder for chaining.
+ */
+ public Builder clearOptimizeForDebug() {
+
+ optimizeForDebug_ = false;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -3483,7 +3572,7 @@ public final class Compile {
static {
java.lang.String[] descriptorData = {
"\n\026commands/compile.proto\022\027cc.arduino.cli" +
- ".commands\032\025commands/common.proto\"\312\002\n\nCom" +
+ ".commands\032\025commands/common.proto\"\344\002\n\nCom" +
"pileReq\0223\n\010instance\030\001 \001(\0132!.cc.arduino.c" +
"li.commands.Instance\022\014\n\004fqbn\030\002 \001(\t\022\022\n\nsk" +
"etchPath\030\003 \001(\t\022\026\n\016showProperties\030\004 \001(\010\022\022" +
@@ -3492,9 +3581,10 @@ public final class Compile {
"\030\010 \003(\t\022\020\n\010warnings\030\t \001(\t\022\017\n\007verbose\030\n \001(" +
"\010\022\r\n\005quiet\030\013 \001(\010\022\016\n\006vidPid\030\014 \001(\t\022\022\n\nexpo" +
"rtFile\030\r \001(\t\022\014\n\004jobs\030\016 \001(\005\022\021\n\tlibraries\030" +
- "\017 \003(\t\"5\n\013CompileResp\022\022\n\nout_stream\030\001 \001(\014" +
- "\022\022\n\nerr_stream\030\002 \001(\014B-Z+github.com/ardui" +
- "no/arduino-cli/rpc/commandsb\006proto3"
+ "\017 \003(\t\022\030\n\020optimizeForDebug\030\020 \001(\010\"5\n\013Compi" +
+ "leResp\022\022\n\nout_stream\030\001 \001(\014\022\022\n\nerr_stream" +
+ "\030\002 \001(\014B-Z+github.com/arduino/arduino-cli" +
+ "/rpc/commandsb\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -3506,7 +3596,7 @@ public final class Compile {
internal_static_cc_arduino_cli_commands_CompileReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_cc_arduino_cli_commands_CompileReq_descriptor,
- new java.lang.String[] { "Instance", "Fqbn", "SketchPath", "ShowProperties", "Preprocess", "BuildCachePath", "BuildPath", "BuildProperties", "Warnings", "Verbose", "Quiet", "VidPid", "ExportFile", "Jobs", "Libraries", });
+ new java.lang.String[] { "Instance", "Fqbn", "SketchPath", "ShowProperties", "Preprocess", "BuildCachePath", "BuildPath", "BuildProperties", "Warnings", "Verbose", "Quiet", "VidPid", "ExportFile", "Jobs", "Libraries", "OptimizeForDebug", });
internal_static_cc_arduino_cli_commands_CompileResp_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_cc_arduino_cli_commands_CompileResp_fieldAccessorTable = new
diff --git a/arduino-core/src/cc/arduino/cli/commands/Lib.java b/arduino-core/src/cc/arduino/cli/commands/Lib.java
index 3f5afb69f..4fc73144b 100644
--- a/arduino-core/src/cc/arduino/cli/commands/Lib.java
+++ b/arduino-core/src/cc/arduino/cli/commands/Lib.java
@@ -11826,6 +11826,67 @@ public final class Lib {
* .cc.arduino.cli.commands.DownloadResource resources = 10;
*/
cc.arduino.cli.commands.Lib.DownloadResourceOrBuilder getResourcesOrBuilder();
+
+ /**
+ * string license = 11;
+ * @return The license.
+ */
+ java.lang.String getLicense();
+ /**
+ * string license = 11;
+ * @return The bytes for license.
+ */
+ com.google.protobuf.ByteString
+ getLicenseBytes();
+
+ /**
+ * repeated string provides_includes = 12;
+ * @return A list containing the providesIncludes.
+ */
+ java.util.List
+ getProvidesIncludesList();
+ /**
+ * repeated string provides_includes = 12;
+ * @return The count of providesIncludes.
+ */
+ int getProvidesIncludesCount();
+ /**
+ * repeated string provides_includes = 12;
+ * @param index The index of the element to return.
+ * @return The providesIncludes at the given index.
+ */
+ java.lang.String getProvidesIncludes(int index);
+ /**
+ * repeated string provides_includes = 12;
+ * @param index The index of the value to return.
+ * @return The bytes of the providesIncludes at the given index.
+ */
+ com.google.protobuf.ByteString
+ getProvidesIncludesBytes(int index);
+
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ java.util.List
+ getDependenciesList();
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ cc.arduino.cli.commands.Lib.LibraryDependency getDependencies(int index);
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ int getDependenciesCount();
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ java.util.List
+ getDependenciesOrBuilderList();
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ cc.arduino.cli.commands.Lib.LibraryDependencyOrBuilder getDependenciesOrBuilder(
+ int index);
}
/**
* Protobuf type {@code cc.arduino.cli.commands.LibraryRelease}
@@ -11849,6 +11910,9 @@ public final class Lib {
category_ = "";
architectures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
types_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ license_ = "";
+ providesIncludes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ dependencies_ = java.util.Collections.emptyList();
}
@java.lang.Override
@@ -11955,6 +12019,30 @@ public final class Lib {
break;
}
+ case 90: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ license_ = s;
+ break;
+ }
+ case 98: {
+ java.lang.String s = input.readStringRequireUtf8();
+ if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+ providesIncludes_ = new com.google.protobuf.LazyStringArrayList();
+ mutable_bitField0_ |= 0x00000004;
+ }
+ providesIncludes_.add(s);
+ break;
+ }
+ case 106: {
+ if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+ dependencies_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000008;
+ }
+ dependencies_.add(
+ input.readMessage(cc.arduino.cli.commands.Lib.LibraryDependency.parser(), extensionRegistry));
+ break;
+ }
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -11976,6 +12064,12 @@ public final class Lib {
if (((mutable_bitField0_ & 0x00000002) != 0)) {
types_ = types_.getUnmodifiableView();
}
+ if (((mutable_bitField0_ & 0x00000004) != 0)) {
+ providesIncludes_ = providesIncludes_.getUnmodifiableView();
+ }
+ if (((mutable_bitField0_ & 0x00000008) != 0)) {
+ dependencies_ = java.util.Collections.unmodifiableList(dependencies_);
+ }
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
@@ -12338,6 +12432,112 @@ public final class Lib {
return getResources();
}
+ public static final int LICENSE_FIELD_NUMBER = 11;
+ private volatile java.lang.Object license_;
+ /**
+ * string license = 11;
+ * @return The license.
+ */
+ public java.lang.String getLicense() {
+ java.lang.Object ref = license_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ license_ = s;
+ return s;
+ }
+ }
+ /**
+ * string license = 11;
+ * @return The bytes for license.
+ */
+ public com.google.protobuf.ByteString
+ getLicenseBytes() {
+ java.lang.Object ref = license_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ license_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int PROVIDES_INCLUDES_FIELD_NUMBER = 12;
+ private com.google.protobuf.LazyStringList providesIncludes_;
+ /**
+ * repeated string provides_includes = 12;
+ * @return A list containing the providesIncludes.
+ */
+ public com.google.protobuf.ProtocolStringList
+ getProvidesIncludesList() {
+ return providesIncludes_;
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @return The count of providesIncludes.
+ */
+ public int getProvidesIncludesCount() {
+ return providesIncludes_.size();
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @param index The index of the element to return.
+ * @return The providesIncludes at the given index.
+ */
+ public java.lang.String getProvidesIncludes(int index) {
+ return providesIncludes_.get(index);
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @param index The index of the value to return.
+ * @return The bytes of the providesIncludes at the given index.
+ */
+ public com.google.protobuf.ByteString
+ getProvidesIncludesBytes(int index) {
+ return providesIncludes_.getByteString(index);
+ }
+
+ public static final int DEPENDENCIES_FIELD_NUMBER = 13;
+ private java.util.List dependencies_;
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public java.util.List getDependenciesList() {
+ return dependencies_;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public java.util.List
+ getDependenciesOrBuilderList() {
+ return dependencies_;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public int getDependenciesCount() {
+ return dependencies_.size();
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public cc.arduino.cli.commands.Lib.LibraryDependency getDependencies(int index) {
+ return dependencies_.get(index);
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public cc.arduino.cli.commands.Lib.LibraryDependencyOrBuilder getDependenciesOrBuilder(
+ int index) {
+ return dependencies_.get(index);
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -12382,6 +12582,15 @@ public final class Lib {
if (resources_ != null) {
output.writeMessage(10, getResources());
}
+ if (!getLicenseBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 11, license_);
+ }
+ for (int i = 0; i < providesIncludes_.size(); i++) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 12, providesIncludes_.getRaw(i));
+ }
+ for (int i = 0; i < dependencies_.size(); i++) {
+ output.writeMessage(13, dependencies_.get(i));
+ }
unknownFields.writeTo(output);
}
@@ -12432,6 +12641,21 @@ public final class Lib {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, getResources());
}
+ if (!getLicenseBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, license_);
+ }
+ {
+ int dataSize = 0;
+ for (int i = 0; i < providesIncludes_.size(); i++) {
+ dataSize += computeStringSizeNoTag(providesIncludes_.getRaw(i));
+ }
+ size += dataSize;
+ size += 1 * getProvidesIncludesList().size();
+ }
+ for (int i = 0; i < dependencies_.size(); i++) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(13, dependencies_.get(i));
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -12470,6 +12694,12 @@ public final class Lib {
if (!getResources()
.equals(other.getResources())) return false;
}
+ if (!getLicense()
+ .equals(other.getLicense())) return false;
+ if (!getProvidesIncludesList()
+ .equals(other.getProvidesIncludesList())) return false;
+ if (!getDependenciesList()
+ .equals(other.getDependenciesList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -12507,6 +12737,16 @@ public final class Lib {
hash = (37 * hash) + RESOURCES_FIELD_NUMBER;
hash = (53 * hash) + getResources().hashCode();
}
+ hash = (37 * hash) + LICENSE_FIELD_NUMBER;
+ hash = (53 * hash) + getLicense().hashCode();
+ if (getProvidesIncludesCount() > 0) {
+ hash = (37 * hash) + PROVIDES_INCLUDES_FIELD_NUMBER;
+ hash = (53 * hash) + getProvidesIncludesList().hashCode();
+ }
+ if (getDependenciesCount() > 0) {
+ hash = (37 * hash) + DEPENDENCIES_FIELD_NUMBER;
+ hash = (53 * hash) + getDependenciesList().hashCode();
+ }
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -12635,6 +12875,7 @@ public final class Lib {
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessageV3
.alwaysUseFieldBuilders) {
+ getDependenciesFieldBuilder();
}
}
@java.lang.Override
@@ -12664,6 +12905,16 @@ public final class Lib {
resources_ = null;
resourcesBuilder_ = null;
}
+ license_ = "";
+
+ providesIncludes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ if (dependenciesBuilder_ == null) {
+ dependencies_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000008);
+ } else {
+ dependenciesBuilder_.clear();
+ }
return this;
}
@@ -12713,6 +12964,21 @@ public final class Lib {
} else {
result.resources_ = resourcesBuilder_.build();
}
+ result.license_ = license_;
+ if (((bitField0_ & 0x00000004) != 0)) {
+ providesIncludes_ = providesIncludes_.getUnmodifiableView();
+ bitField0_ = (bitField0_ & ~0x00000004);
+ }
+ result.providesIncludes_ = providesIncludes_;
+ if (dependenciesBuilder_ == null) {
+ if (((bitField0_ & 0x00000008) != 0)) {
+ dependencies_ = java.util.Collections.unmodifiableList(dependencies_);
+ bitField0_ = (bitField0_ & ~0x00000008);
+ }
+ result.dependencies_ = dependencies_;
+ } else {
+ result.dependencies_ = dependenciesBuilder_.build();
+ }
onBuilt();
return result;
}
@@ -12812,6 +13078,46 @@ public final class Lib {
if (other.hasResources()) {
mergeResources(other.getResources());
}
+ if (!other.getLicense().isEmpty()) {
+ license_ = other.license_;
+ onChanged();
+ }
+ if (!other.providesIncludes_.isEmpty()) {
+ if (providesIncludes_.isEmpty()) {
+ providesIncludes_ = other.providesIncludes_;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ } else {
+ ensureProvidesIncludesIsMutable();
+ providesIncludes_.addAll(other.providesIncludes_);
+ }
+ onChanged();
+ }
+ if (dependenciesBuilder_ == null) {
+ if (!other.dependencies_.isEmpty()) {
+ if (dependencies_.isEmpty()) {
+ dependencies_ = other.dependencies_;
+ bitField0_ = (bitField0_ & ~0x00000008);
+ } else {
+ ensureDependenciesIsMutable();
+ dependencies_.addAll(other.dependencies_);
+ }
+ onChanged();
+ }
+ } else {
+ if (!other.dependencies_.isEmpty()) {
+ if (dependenciesBuilder_.isEmpty()) {
+ dependenciesBuilder_.dispose();
+ dependenciesBuilder_ = null;
+ dependencies_ = other.dependencies_;
+ bitField0_ = (bitField0_ & ~0x00000008);
+ dependenciesBuilder_ =
+ com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+ getDependenciesFieldBuilder() : null;
+ } else {
+ dependenciesBuilder_.addAllMessages(other.dependencies_);
+ }
+ }
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -13712,6 +14018,432 @@ public final class Lib {
}
return resourcesBuilder_;
}
+
+ private java.lang.Object license_ = "";
+ /**
+ * string license = 11;
+ * @return The license.
+ */
+ public java.lang.String getLicense() {
+ java.lang.Object ref = license_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ license_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string license = 11;
+ * @return The bytes for license.
+ */
+ public com.google.protobuf.ByteString
+ getLicenseBytes() {
+ java.lang.Object ref = license_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ license_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string license = 11;
+ * @param value The license to set.
+ * @return This builder for chaining.
+ */
+ public Builder setLicense(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ license_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string license = 11;
+ * @return This builder for chaining.
+ */
+ public Builder clearLicense() {
+
+ license_ = getDefaultInstance().getLicense();
+ onChanged();
+ return this;
+ }
+ /**
+ * string license = 11;
+ * @param value The bytes for license to set.
+ * @return This builder for chaining.
+ */
+ public Builder setLicenseBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ license_ = value;
+ onChanged();
+ return this;
+ }
+
+ private com.google.protobuf.LazyStringList providesIncludes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ private void ensureProvidesIncludesIsMutable() {
+ if (!((bitField0_ & 0x00000004) != 0)) {
+ providesIncludes_ = new com.google.protobuf.LazyStringArrayList(providesIncludes_);
+ bitField0_ |= 0x00000004;
+ }
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @return A list containing the providesIncludes.
+ */
+ public com.google.protobuf.ProtocolStringList
+ getProvidesIncludesList() {
+ return providesIncludes_.getUnmodifiableView();
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @return The count of providesIncludes.
+ */
+ public int getProvidesIncludesCount() {
+ return providesIncludes_.size();
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @param index The index of the element to return.
+ * @return The providesIncludes at the given index.
+ */
+ public java.lang.String getProvidesIncludes(int index) {
+ return providesIncludes_.get(index);
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @param index The index of the value to return.
+ * @return The bytes of the providesIncludes at the given index.
+ */
+ public com.google.protobuf.ByteString
+ getProvidesIncludesBytes(int index) {
+ return providesIncludes_.getByteString(index);
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @param index The index to set the value at.
+ * @param value The providesIncludes to set.
+ * @return This builder for chaining.
+ */
+ public Builder setProvidesIncludes(
+ int index, java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureProvidesIncludesIsMutable();
+ providesIncludes_.set(index, value);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @param value The providesIncludes to add.
+ * @return This builder for chaining.
+ */
+ public Builder addProvidesIncludes(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureProvidesIncludesIsMutable();
+ providesIncludes_.add(value);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @param values The providesIncludes to add.
+ * @return This builder for chaining.
+ */
+ public Builder addAllProvidesIncludes(
+ java.lang.Iterable values) {
+ ensureProvidesIncludesIsMutable();
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, providesIncludes_);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @return This builder for chaining.
+ */
+ public Builder clearProvidesIncludes() {
+ providesIncludes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated string provides_includes = 12;
+ * @param value The bytes of the providesIncludes to add.
+ * @return This builder for chaining.
+ */
+ public Builder addProvidesIncludesBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+ ensureProvidesIncludesIsMutable();
+ providesIncludes_.add(value);
+ onChanged();
+ return this;
+ }
+
+ private java.util.List dependencies_ =
+ java.util.Collections.emptyList();
+ private void ensureDependenciesIsMutable() {
+ if (!((bitField0_ & 0x00000008) != 0)) {
+ dependencies_ = new java.util.ArrayList(dependencies_);
+ bitField0_ |= 0x00000008;
+ }
+ }
+
+ private com.google.protobuf.RepeatedFieldBuilderV3<
+ cc.arduino.cli.commands.Lib.LibraryDependency, cc.arduino.cli.commands.Lib.LibraryDependency.Builder, cc.arduino.cli.commands.Lib.LibraryDependencyOrBuilder> dependenciesBuilder_;
+
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public java.util.List getDependenciesList() {
+ if (dependenciesBuilder_ == null) {
+ return java.util.Collections.unmodifiableList(dependencies_);
+ } else {
+ return dependenciesBuilder_.getMessageList();
+ }
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public int getDependenciesCount() {
+ if (dependenciesBuilder_ == null) {
+ return dependencies_.size();
+ } else {
+ return dependenciesBuilder_.getCount();
+ }
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public cc.arduino.cli.commands.Lib.LibraryDependency getDependencies(int index) {
+ if (dependenciesBuilder_ == null) {
+ return dependencies_.get(index);
+ } else {
+ return dependenciesBuilder_.getMessage(index);
+ }
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public Builder setDependencies(
+ int index, cc.arduino.cli.commands.Lib.LibraryDependency value) {
+ if (dependenciesBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureDependenciesIsMutable();
+ dependencies_.set(index, value);
+ onChanged();
+ } else {
+ dependenciesBuilder_.setMessage(index, value);
+ }
+ return this;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public Builder setDependencies(
+ int index, cc.arduino.cli.commands.Lib.LibraryDependency.Builder builderForValue) {
+ if (dependenciesBuilder_ == null) {
+ ensureDependenciesIsMutable();
+ dependencies_.set(index, builderForValue.build());
+ onChanged();
+ } else {
+ dependenciesBuilder_.setMessage(index, builderForValue.build());
+ }
+ return this;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public Builder addDependencies(cc.arduino.cli.commands.Lib.LibraryDependency value) {
+ if (dependenciesBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureDependenciesIsMutable();
+ dependencies_.add(value);
+ onChanged();
+ } else {
+ dependenciesBuilder_.addMessage(value);
+ }
+ return this;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public Builder addDependencies(
+ int index, cc.arduino.cli.commands.Lib.LibraryDependency value) {
+ if (dependenciesBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureDependenciesIsMutable();
+ dependencies_.add(index, value);
+ onChanged();
+ } else {
+ dependenciesBuilder_.addMessage(index, value);
+ }
+ return this;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public Builder addDependencies(
+ cc.arduino.cli.commands.Lib.LibraryDependency.Builder builderForValue) {
+ if (dependenciesBuilder_ == null) {
+ ensureDependenciesIsMutable();
+ dependencies_.add(builderForValue.build());
+ onChanged();
+ } else {
+ dependenciesBuilder_.addMessage(builderForValue.build());
+ }
+ return this;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public Builder addDependencies(
+ int index, cc.arduino.cli.commands.Lib.LibraryDependency.Builder builderForValue) {
+ if (dependenciesBuilder_ == null) {
+ ensureDependenciesIsMutable();
+ dependencies_.add(index, builderForValue.build());
+ onChanged();
+ } else {
+ dependenciesBuilder_.addMessage(index, builderForValue.build());
+ }
+ return this;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public Builder addAllDependencies(
+ java.lang.Iterable values) {
+ if (dependenciesBuilder_ == null) {
+ ensureDependenciesIsMutable();
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, dependencies_);
+ onChanged();
+ } else {
+ dependenciesBuilder_.addAllMessages(values);
+ }
+ return this;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public Builder clearDependencies() {
+ if (dependenciesBuilder_ == null) {
+ dependencies_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000008);
+ onChanged();
+ } else {
+ dependenciesBuilder_.clear();
+ }
+ return this;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public Builder removeDependencies(int index) {
+ if (dependenciesBuilder_ == null) {
+ ensureDependenciesIsMutable();
+ dependencies_.remove(index);
+ onChanged();
+ } else {
+ dependenciesBuilder_.remove(index);
+ }
+ return this;
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public cc.arduino.cli.commands.Lib.LibraryDependency.Builder getDependenciesBuilder(
+ int index) {
+ return getDependenciesFieldBuilder().getBuilder(index);
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public cc.arduino.cli.commands.Lib.LibraryDependencyOrBuilder getDependenciesOrBuilder(
+ int index) {
+ if (dependenciesBuilder_ == null) {
+ return dependencies_.get(index); } else {
+ return dependenciesBuilder_.getMessageOrBuilder(index);
+ }
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public java.util.List
+ getDependenciesOrBuilderList() {
+ if (dependenciesBuilder_ != null) {
+ return dependenciesBuilder_.getMessageOrBuilderList();
+ } else {
+ return java.util.Collections.unmodifiableList(dependencies_);
+ }
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public cc.arduino.cli.commands.Lib.LibraryDependency.Builder addDependenciesBuilder() {
+ return getDependenciesFieldBuilder().addBuilder(
+ cc.arduino.cli.commands.Lib.LibraryDependency.getDefaultInstance());
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public cc.arduino.cli.commands.Lib.LibraryDependency.Builder addDependenciesBuilder(
+ int index) {
+ return getDependenciesFieldBuilder().addBuilder(
+ index, cc.arduino.cli.commands.Lib.LibraryDependency.getDefaultInstance());
+ }
+ /**
+ * repeated .cc.arduino.cli.commands.LibraryDependency dependencies = 13;
+ */
+ public java.util.List
+ getDependenciesBuilderList() {
+ return getDependenciesFieldBuilder().getBuilderList();
+ }
+ private com.google.protobuf.RepeatedFieldBuilderV3<
+ cc.arduino.cli.commands.Lib.LibraryDependency, cc.arduino.cli.commands.Lib.LibraryDependency.Builder, cc.arduino.cli.commands.Lib.LibraryDependencyOrBuilder>
+ getDependenciesFieldBuilder() {
+ if (dependenciesBuilder_ == null) {
+ dependenciesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+ cc.arduino.cli.commands.Lib.LibraryDependency, cc.arduino.cli.commands.Lib.LibraryDependency.Builder, cc.arduino.cli.commands.Lib.LibraryDependencyOrBuilder>(
+ dependencies_,
+ ((bitField0_ & 0x00000008) != 0),
+ getParentForChildren(),
+ isClean());
+ dependencies_ = null;
+ }
+ return dependenciesBuilder_;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -13765,6 +14497,720 @@ public final class Lib {
}
+ public interface LibraryDependencyOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:cc.arduino.cli.commands.LibraryDependency)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * string name = 1;
+ * @return The name.
+ */
+ java.lang.String getName();
+ /**
+ * string name = 1;
+ * @return The bytes for name.
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
+
+ /**
+ * string version_constraint = 2;
+ * @return The versionConstraint.
+ */
+ java.lang.String getVersionConstraint();
+ /**
+ * string version_constraint = 2;
+ * @return The bytes for versionConstraint.
+ */
+ com.google.protobuf.ByteString
+ getVersionConstraintBytes();
+ }
+ /**
+ * Protobuf type {@code cc.arduino.cli.commands.LibraryDependency}
+ */
+ public static final class LibraryDependency extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:cc.arduino.cli.commands.LibraryDependency)
+ LibraryDependencyOrBuilder {
+ private static final long serialVersionUID = 0L;
+ // Use LibraryDependency.newBuilder() to construct.
+ private LibraryDependency(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private LibraryDependency() {
+ name_ = "";
+ versionConstraint_ = "";
+ }
+
+ @java.lang.Override
+ @SuppressWarnings({"unused"})
+ protected java.lang.Object newInstance(
+ UnusedPrivateParameter unused) {
+ return new LibraryDependency();
+ }
+
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private LibraryDependency(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
+ case 18: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ versionConstraint_ = s;
+ break;
+ }
+ default: {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return cc.arduino.cli.commands.Lib.internal_static_cc_arduino_cli_commands_LibraryDependency_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return cc.arduino.cli.commands.Lib.internal_static_cc_arduino_cli_commands_LibraryDependency_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ cc.arduino.cli.commands.Lib.LibraryDependency.class, cc.arduino.cli.commands.Lib.LibraryDependency.Builder.class);
+ }
+
+ public static final int NAME_FIELD_NUMBER = 1;
+ private volatile java.lang.Object name_;
+ /**
+ * string name = 1;
+ * @return The name.
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ * string name = 1;
+ * @return The bytes for name.
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int VERSION_CONSTRAINT_FIELD_NUMBER = 2;
+ private volatile java.lang.Object versionConstraint_;
+ /**
+ * string version_constraint = 2;
+ * @return The versionConstraint.
+ */
+ public java.lang.String getVersionConstraint() {
+ java.lang.Object ref = versionConstraint_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ versionConstraint_ = s;
+ return s;
+ }
+ }
+ /**
+ * string version_constraint = 2;
+ * @return The bytes for versionConstraint.
+ */
+ public com.google.protobuf.ByteString
+ getVersionConstraintBytes() {
+ java.lang.Object ref = versionConstraint_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ versionConstraint_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+ }
+ if (!getVersionConstraintBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 2, versionConstraint_);
+ }
+ unknownFields.writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+ }
+ if (!getVersionConstraintBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, versionConstraint_);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof cc.arduino.cli.commands.Lib.LibraryDependency)) {
+ return super.equals(obj);
+ }
+ cc.arduino.cli.commands.Lib.LibraryDependency other = (cc.arduino.cli.commands.Lib.LibraryDependency) obj;
+
+ if (!getName()
+ .equals(other.getName())) return false;
+ if (!getVersionConstraint()
+ .equals(other.getVersionConstraint())) return false;
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
+ hash = (37 * hash) + VERSION_CONSTRAINT_FIELD_NUMBER;
+ hash = (53 * hash) + getVersionConstraint().hashCode();
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static cc.arduino.cli.commands.Lib.LibraryDependency parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(cc.arduino.cli.commands.Lib.LibraryDependency prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code cc.arduino.cli.commands.LibraryDependency}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:cc.arduino.cli.commands.LibraryDependency)
+ cc.arduino.cli.commands.Lib.LibraryDependencyOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return cc.arduino.cli.commands.Lib.internal_static_cc_arduino_cli_commands_LibraryDependency_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return cc.arduino.cli.commands.Lib.internal_static_cc_arduino_cli_commands_LibraryDependency_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ cc.arduino.cli.commands.Lib.LibraryDependency.class, cc.arduino.cli.commands.Lib.LibraryDependency.Builder.class);
+ }
+
+ // Construct using cc.arduino.cli.commands.Lib.LibraryDependency.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ @java.lang.Override
+ public Builder clear() {
+ super.clear();
+ name_ = "";
+
+ versionConstraint_ = "";
+
+ return this;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return cc.arduino.cli.commands.Lib.internal_static_cc_arduino_cli_commands_LibraryDependency_descriptor;
+ }
+
+ @java.lang.Override
+ public cc.arduino.cli.commands.Lib.LibraryDependency getDefaultInstanceForType() {
+ return cc.arduino.cli.commands.Lib.LibraryDependency.getDefaultInstance();
+ }
+
+ @java.lang.Override
+ public cc.arduino.cli.commands.Lib.LibraryDependency build() {
+ cc.arduino.cli.commands.Lib.LibraryDependency result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @java.lang.Override
+ public cc.arduino.cli.commands.Lib.LibraryDependency buildPartial() {
+ cc.arduino.cli.commands.Lib.LibraryDependency result = new cc.arduino.cli.commands.Lib.LibraryDependency(this);
+ result.name_ = name_;
+ result.versionConstraint_ = versionConstraint_;
+ onBuilt();
+ return result;
+ }
+
+ @java.lang.Override
+ public Builder clone() {
+ return super.clone();
+ }
+ @java.lang.Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return super.setField(field, value);
+ }
+ @java.lang.Override
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return super.clearField(field);
+ }
+ @java.lang.Override
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return super.clearOneof(oneof);
+ }
+ @java.lang.Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, java.lang.Object value) {
+ return super.setRepeatedField(field, index, value);
+ }
+ @java.lang.Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return super.addRepeatedField(field, value);
+ }
+ @java.lang.Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof cc.arduino.cli.commands.Lib.LibraryDependency) {
+ return mergeFrom((cc.arduino.cli.commands.Lib.LibraryDependency)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(cc.arduino.cli.commands.Lib.LibraryDependency other) {
+ if (other == cc.arduino.cli.commands.Lib.LibraryDependency.getDefaultInstance()) return this;
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
+ if (!other.getVersionConstraint().isEmpty()) {
+ versionConstraint_ = other.versionConstraint_;
+ onChanged();
+ }
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ cc.arduino.cli.commands.Lib.LibraryDependency parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (cc.arduino.cli.commands.Lib.LibraryDependency) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+
+ private java.lang.Object name_ = "";
+ /**
+ * string name = 1;
+ * @return The name.
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string name = 1;
+ * @return The bytes for name.
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string name = 1;
+ * @param value The name to set.
+ * @return This builder for chaining.
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string name = 1;
+ * @return This builder for chaining.
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ * string name = 1;
+ * @param value The bytes for name to set.
+ * @return This builder for chaining.
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object versionConstraint_ = "";
+ /**
+ * string version_constraint = 2;
+ * @return The versionConstraint.
+ */
+ public java.lang.String getVersionConstraint() {
+ java.lang.Object ref = versionConstraint_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ versionConstraint_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string version_constraint = 2;
+ * @return The bytes for versionConstraint.
+ */
+ public com.google.protobuf.ByteString
+ getVersionConstraintBytes() {
+ java.lang.Object ref = versionConstraint_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ versionConstraint_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string version_constraint = 2;
+ * @param value The versionConstraint to set.
+ * @return This builder for chaining.
+ */
+ public Builder setVersionConstraint(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ versionConstraint_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string version_constraint = 2;
+ * @return This builder for chaining.
+ */
+ public Builder clearVersionConstraint() {
+
+ versionConstraint_ = getDefaultInstance().getVersionConstraint();
+ onChanged();
+ return this;
+ }
+ /**
+ * string version_constraint = 2;
+ * @param value The bytes for versionConstraint to set.
+ * @return This builder for chaining.
+ */
+ public Builder setVersionConstraintBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ versionConstraint_ = value;
+ onChanged();
+ return this;
+ }
+ @java.lang.Override
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFields(unknownFields);
+ }
+
+ @java.lang.Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:cc.arduino.cli.commands.LibraryDependency)
+ }
+
+ // @@protoc_insertion_point(class_scope:cc.arduino.cli.commands.LibraryDependency)
+ private static final cc.arduino.cli.commands.Lib.LibraryDependency DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new cc.arduino.cli.commands.Lib.LibraryDependency();
+ }
+
+ public static cc.arduino.cli.commands.Lib.LibraryDependency getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @java.lang.Override
+ public LibraryDependency parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new LibraryDependency(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public cc.arduino.cli.commands.Lib.LibraryDependency getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+ }
+
public interface DownloadResourceOrBuilder extends
// @@protoc_insertion_point(interface_extends:cc.arduino.cli.commands.DownloadResource)
com.google.protobuf.MessageOrBuilder {
@@ -21128,6 +22574,11 @@ public final class Lib {
private static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_cc_arduino_cli_commands_LibraryRelease_fieldAccessorTable;
+ private static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_cc_arduino_cli_commands_LibraryDependency_descriptor;
+ private static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_cc_arduino_cli_commands_LibraryDependency_fieldAccessorTable;
private static final com.google.protobuf.Descriptors.Descriptor
internal_static_cc_arduino_cli_commands_DownloadResource_descriptor;
private static final
@@ -21208,44 +22659,48 @@ public final class Lib {
"y\0227\n\006latest\030\003 \001(\0132\'.cc.arduino.cli.comma" +
"nds.LibraryRelease\032X\n\rReleasesEntry\022\013\n\003k" +
"ey\030\001 \001(\t\0226\n\005value\030\002 \001(\0132\'.cc.arduino.cli" +
- ".commands.LibraryRelease:\0028\001\"\361\001\n\016Library" +
+ ".commands.LibraryRelease:\0028\001\"\337\002\n\016Library" +
"Release\022\016\n\006author\030\001 \001(\t\022\017\n\007version\030\002 \001(\t" +
"\022\022\n\nmaintainer\030\003 \001(\t\022\020\n\010sentence\030\004 \001(\t\022\021" +
"\n\tparagraph\030\005 \001(\t\022\017\n\007website\030\006 \001(\t\022\020\n\010ca" +
"tegory\030\007 \001(\t\022\025\n\rarchitectures\030\010 \003(\t\022\r\n\005t" +
"ypes\030\t \003(\t\022<\n\tresources\030\n \001(\0132).cc.ardui" +
- "no.cli.commands.DownloadResource\"k\n\020Down" +
- "loadResource\022\013\n\003url\030\001 \001(\t\022\027\n\017archivefile" +
- "name\030\002 \001(\t\022\020\n\010checksum\030\003 \001(\t\022\014\n\004size\030\004 \001" +
- "(\003\022\021\n\tcachepath\030\005 \001(\t\"e\n\016LibraryListReq\022" +
- "3\n\010instance\030\001 \001(\0132!.cc.arduino.cli.comma" +
- "nds.Instance\022\013\n\003all\030\002 \001(\010\022\021\n\tupdatable\030\003" +
- " \001(\010\"W\n\017LibraryListResp\022D\n\021installed_lib" +
- "rary\030\001 \003(\0132).cc.arduino.cli.commands.Ins" +
- "talledLibrary\"\177\n\020InstalledLibrary\0221\n\007lib" +
- "rary\030\001 \001(\0132 .cc.arduino.cli.commands.Lib" +
- "rary\0228\n\007release\030\002 \001(\0132\'.cc.arduino.cli.c" +
- "ommands.LibraryRelease\"\316\004\n\007Library\022\014\n\004na" +
- "me\030\001 \001(\t\022\016\n\006author\030\002 \001(\t\022\022\n\nmaintainer\030\003" +
- " \001(\t\022\020\n\010sentence\030\004 \001(\t\022\021\n\tparagraph\030\005 \001(" +
- "\t\022\017\n\007website\030\006 \001(\t\022\020\n\010category\030\007 \001(\t\022\025\n\r" +
- "architectures\030\010 \003(\t\022\r\n\005types\030\t \003(\t\022\023\n\013in" +
- "stall_dir\030\n \001(\t\022\022\n\nsource_dir\030\013 \001(\t\022\023\n\013u" +
- "tility_dir\030\014 \001(\t\022\032\n\022container_platform\030\016" +
- " \001(\t\022\016\n\006layout\030\017 \001(\t\022\021\n\treal_name\030\020 \001(\t\022" +
- "\025\n\rdot_a_linkage\030\021 \001(\010\022\023\n\013precompiled\030\022 " +
- "\001(\010\022\020\n\010ld_flags\030\023 \001(\t\022\021\n\tis_legacy\030\024 \001(\010" +
- "\022\017\n\007version\030\025 \001(\t\022\017\n\007license\030\026 \001(\t\022D\n\npr" +
- "operties\030\027 \003(\01320.cc.arduino.cli.commands" +
- ".Library.PropertiesEntry\022:\n\010location\030\030 \001" +
- "(\0162(.cc.arduino.cli.commands.LibraryLoca" +
- "tion\0321\n\017PropertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" +
- "value\030\002 \001(\t:\0028\001*6\n\rLibraryLayout\022\017\n\013flat" +
- "_layout\020\000\022\024\n\020recursive_layout\020\001*c\n\017Libra" +
- "ryLocation\022\017\n\013ide_builtin\020\000\022\010\n\004user\020\001\022\024\n" +
- "\020platform_builtin\020\002\022\037\n\033referenced_platfo" +
- "rm_builtin\020\003B-Z+github.com/arduino/ardui" +
- "no-cli/rpc/commandsb\006proto3"
+ "no.cli.commands.DownloadResource\022\017\n\007lice" +
+ "nse\030\013 \001(\t\022\031\n\021provides_includes\030\014 \003(\t\022@\n\014" +
+ "dependencies\030\r \003(\0132*.cc.arduino.cli.comm" +
+ "ands.LibraryDependency\"=\n\021LibraryDepende" +
+ "ncy\022\014\n\004name\030\001 \001(\t\022\032\n\022version_constraint\030" +
+ "\002 \001(\t\"k\n\020DownloadResource\022\013\n\003url\030\001 \001(\t\022\027" +
+ "\n\017archivefilename\030\002 \001(\t\022\020\n\010checksum\030\003 \001(" +
+ "\t\022\014\n\004size\030\004 \001(\003\022\021\n\tcachepath\030\005 \001(\t\"e\n\016Li" +
+ "braryListReq\0223\n\010instance\030\001 \001(\0132!.cc.ardu" +
+ "ino.cli.commands.Instance\022\013\n\003all\030\002 \001(\010\022\021" +
+ "\n\tupdatable\030\003 \001(\010\"W\n\017LibraryListResp\022D\n\021" +
+ "installed_library\030\001 \003(\0132).cc.arduino.cli" +
+ ".commands.InstalledLibrary\"\177\n\020InstalledL" +
+ "ibrary\0221\n\007library\030\001 \001(\0132 .cc.arduino.cli" +
+ ".commands.Library\0228\n\007release\030\002 \001(\0132\'.cc." +
+ "arduino.cli.commands.LibraryRelease\"\316\004\n\007" +
+ "Library\022\014\n\004name\030\001 \001(\t\022\016\n\006author\030\002 \001(\t\022\022\n" +
+ "\nmaintainer\030\003 \001(\t\022\020\n\010sentence\030\004 \001(\t\022\021\n\tp" +
+ "aragraph\030\005 \001(\t\022\017\n\007website\030\006 \001(\t\022\020\n\010categ" +
+ "ory\030\007 \001(\t\022\025\n\rarchitectures\030\010 \003(\t\022\r\n\005type" +
+ "s\030\t \003(\t\022\023\n\013install_dir\030\n \001(\t\022\022\n\nsource_d" +
+ "ir\030\013 \001(\t\022\023\n\013utility_dir\030\014 \001(\t\022\032\n\022contain" +
+ "er_platform\030\016 \001(\t\022\016\n\006layout\030\017 \001(\t\022\021\n\trea" +
+ "l_name\030\020 \001(\t\022\025\n\rdot_a_linkage\030\021 \001(\010\022\023\n\013p" +
+ "recompiled\030\022 \001(\010\022\020\n\010ld_flags\030\023 \001(\t\022\021\n\tis" +
+ "_legacy\030\024 \001(\010\022\017\n\007version\030\025 \001(\t\022\017\n\007licens" +
+ "e\030\026 \001(\t\022D\n\nproperties\030\027 \003(\01320.cc.arduino" +
+ ".cli.commands.Library.PropertiesEntry\022:\n" +
+ "\010location\030\030 \001(\0162(.cc.arduino.cli.command" +
+ "s.LibraryLocation\0321\n\017PropertiesEntry\022\013\n\003" +
+ "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001*6\n\rLibraryL" +
+ "ayout\022\017\n\013flat_layout\020\000\022\024\n\020recursive_layo" +
+ "ut\020\001*c\n\017LibraryLocation\022\017\n\013ide_builtin\020\000" +
+ "\022\010\n\004user\020\001\022\024\n\020platform_builtin\020\002\022\037\n\033refe" +
+ "renced_platform_builtin\020\003B-Z+github.com/" +
+ "arduino/arduino-cli/rpc/commandsb\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -21347,33 +22802,39 @@ public final class Lib {
internal_static_cc_arduino_cli_commands_LibraryRelease_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_cc_arduino_cli_commands_LibraryRelease_descriptor,
- new java.lang.String[] { "Author", "Version", "Maintainer", "Sentence", "Paragraph", "Website", "Category", "Architectures", "Types", "Resources", });
- internal_static_cc_arduino_cli_commands_DownloadResource_descriptor =
+ new java.lang.String[] { "Author", "Version", "Maintainer", "Sentence", "Paragraph", "Website", "Category", "Architectures", "Types", "Resources", "License", "ProvidesIncludes", "Dependencies", });
+ internal_static_cc_arduino_cli_commands_LibraryDependency_descriptor =
getDescriptor().getMessageTypes().get(15);
+ internal_static_cc_arduino_cli_commands_LibraryDependency_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_cc_arduino_cli_commands_LibraryDependency_descriptor,
+ new java.lang.String[] { "Name", "VersionConstraint", });
+ internal_static_cc_arduino_cli_commands_DownloadResource_descriptor =
+ getDescriptor().getMessageTypes().get(16);
internal_static_cc_arduino_cli_commands_DownloadResource_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_cc_arduino_cli_commands_DownloadResource_descriptor,
new java.lang.String[] { "Url", "Archivefilename", "Checksum", "Size", "Cachepath", });
internal_static_cc_arduino_cli_commands_LibraryListReq_descriptor =
- getDescriptor().getMessageTypes().get(16);
+ getDescriptor().getMessageTypes().get(17);
internal_static_cc_arduino_cli_commands_LibraryListReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_cc_arduino_cli_commands_LibraryListReq_descriptor,
new java.lang.String[] { "Instance", "All", "Updatable", });
internal_static_cc_arduino_cli_commands_LibraryListResp_descriptor =
- getDescriptor().getMessageTypes().get(17);
+ getDescriptor().getMessageTypes().get(18);
internal_static_cc_arduino_cli_commands_LibraryListResp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_cc_arduino_cli_commands_LibraryListResp_descriptor,
new java.lang.String[] { "InstalledLibrary", });
internal_static_cc_arduino_cli_commands_InstalledLibrary_descriptor =
- getDescriptor().getMessageTypes().get(18);
+ getDescriptor().getMessageTypes().get(19);
internal_static_cc_arduino_cli_commands_InstalledLibrary_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_cc_arduino_cli_commands_InstalledLibrary_descriptor,
new java.lang.String[] { "Library", "Release", });
internal_static_cc_arduino_cli_commands_Library_descriptor =
- getDescriptor().getMessageTypes().get(19);
+ getDescriptor().getMessageTypes().get(20);
internal_static_cc_arduino_cli_commands_Library_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_cc_arduino_cli_commands_Library_descriptor,
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java
deleted file mode 100644
index 4da5ba6f7..000000000
--- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of Arduino.
- *
- * Copyright 2014 Arduino LLC (http://www.arduino.cc/)
- *
- * Arduino is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction. Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License. This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- */
-
-package cc.arduino.contributions.libraries;
-
-public class ContributedLibraryDependency {
-
- private String name;
- private String version;
-
- public String getName() { return name; }
-
- public String getVersion() { return version; }
-
- @Override
- public String toString() {
- return getName() + " " + getVersion();
- }
-}
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryRelease.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryRelease.java
index aff62abd8..0e65041fb 100644
--- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryRelease.java
+++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryRelease.java
@@ -29,6 +29,7 @@
package cc.arduino.contributions.libraries;
+import cc.arduino.cli.commands.Lib;
import cc.arduino.contributions.DownloadableContribution;
import processing.app.I18n;
import processing.app.packages.UserLibrary;
@@ -52,7 +53,7 @@ public class ContributedLibraryRelease extends DownloadableContribution {
final private String sentence;
final private List architectures;
final private List types;
- final private List dependencies;
+ final private List dependencies;
final private List providesIncludes;
public ContributedLibraryRelease(ContributedLibrary library,
@@ -61,7 +62,7 @@ public class ContributedLibraryRelease extends DownloadableContribution {
String license, String paragraph,
String sentence, List architectures,
List types,
- List dependencies,
+ List dependencies,
List providesIncludes, //
//
String url, String version, String checksum,
@@ -130,7 +131,7 @@ public class ContributedLibraryRelease extends DownloadableContribution {
return types;
}
- public List getDependencies() {
+ public List getDependencies() {
return dependencies;
}
@@ -252,7 +253,7 @@ public class ContributedLibraryRelease extends DownloadableContribution {
res += "\n";
res += " requires :\n";
if (getDependencies() != null)
- for (ContributedLibraryDependency r : getDependencies()) {
+ for (Lib.LibraryDependency r : getDependencies()) {
res += " " + r;
}
res += "\n";
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
index 5ae601d32..6b27e0a0b 100644
--- a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
+++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
@@ -75,13 +75,13 @@ public class LibrariesIndexer {
rel.getAuthor(), //
rel.getWebsite(), //
rel.getCategory(), //
- "", // TODO: license
+ rel.getLicense(), //
rel.getParagraph(), //
rel.getSentence(), //
rel.getArchitecturesList(), //
rel.getTypesList(), //
- null, // TODO: dependencies - List
- null, // TODO: providesIncludes - List
+ rel.getDependenciesList(), //
+ rel.getProvidesIncludesList(), //
//
rel.getResources().getUrl(), //
rel.getVersion(), //
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java
deleted file mode 100644
index 7af00bdd9..000000000
--- a/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * This file is part of Arduino.
- *
- * Copyright 2017 Arduino LLC (http://www.arduino.cc/)
- *
- * Arduino is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction. Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License. This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- */
-
-package cc.arduino.contributions.libraries;
-
-import java.util.ArrayList;
-
-public class UnavailableContributedLibrary extends ContributedLibraryRelease {
-
- public UnavailableContributedLibrary(ContributedLibraryDependency dependency) {
- this(dependency.getName(), dependency.getVersion());
- }
-
- public UnavailableContributedLibrary(String name, String version) {
- super(new ContributedLibrary(name), "Unknown", "Unknown", "Unknown",
- "Uncategorized", "Unknown", "", "", new ArrayList<>(),
- new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), "", version,
- "", 0, "");
- }
-
- @Override
- public String toString() {
- return "!" + super.toString();
- }
-}
diff --git a/arduino-core/src/processing/app/packages/UserLibrary.java b/arduino-core/src/processing/app/packages/UserLibrary.java
index 80400cdc6..2dda9092a 100644
--- a/arduino-core/src/processing/app/packages/UserLibrary.java
+++ b/arduino-core/src/processing/app/packages/UserLibrary.java
@@ -31,10 +31,8 @@ package processing.app.packages;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import cc.arduino.cli.commands.Lib.LibraryLocation;
-import cc.arduino.contributions.libraries.ContributedLibraryDependency;
public class UserLibrary {
@@ -142,10 +140,6 @@ public class UserLibrary {
return maintainer;
}
- public List getRequires() {
- return null;
- }
-
public Collection getDeclaredTypes() {
return declaredTypes;
}