Skip to content

Commit 71b1b9c

Browse files
kittaakosAkos Kitta
kittaakos
authored and
Akos Kitta
committed
revert(cli): Downgrade the CLI version to 0.32.2
This reverts commit 0fbd1fb. Reverts: #2083 Signed-off-by: Akos Kitta <[email protected]>
1 parent d79bc0d commit 71b1b9c

File tree

9 files changed

+7
-256
lines changed

9 files changed

+7
-256
lines changed

‎arduino-ide-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
],
171171
"arduino": {
172172
"cli": {
173-
"version": "0.33.0"
173+
"version": "0.32.2"
174174
},
175175
"fwuploader": {
176176
"version": "2.2.2"

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/board_pb.d.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ export class BoardDetailsRequest extends jspb.Message {
1818
getFqbn(): string;
1919
setFqbn(value: string): BoardDetailsRequest;
2020

21-
getDoNotExpandBuildProperties(): boolean;
22-
setDoNotExpandBuildProperties(value: boolean): BoardDetailsRequest;
23-
2421

2522
serializeBinary(): Uint8Array;
2623
toObject(includeInstance?: boolean): BoardDetailsRequest.AsObject;
@@ -36,7 +33,6 @@ export namespace BoardDetailsRequest {
3633
export type AsObject = {
3734
instance?: cc_arduino_cli_commands_v1_common_pb.Instance.AsObject,
3835
fqbn: string,
39-
doNotExpandBuildProperties: boolean,
4036
}
4137
}
4238

@@ -97,11 +93,6 @@ export class BoardDetailsResponse extends jspb.Message {
9793
setIdentificationPropertiesList(value: Array<BoardIdentificationProperties>): BoardDetailsResponse;
9894
addIdentificationProperties(value?: BoardIdentificationProperties, index?: number): BoardIdentificationProperties;
9995

100-
clearBuildPropertiesList(): void;
101-
getBuildPropertiesList(): Array<string>;
102-
setBuildPropertiesList(value: Array<string>): BoardDetailsResponse;
103-
addBuildProperties(value: string, index?: number): string;
104-
10596

10697
serializeBinary(): Uint8Array;
10798
toObject(includeInstance?: boolean): BoardDetailsResponse.AsObject;
@@ -129,7 +120,6 @@ export namespace BoardDetailsResponse {
129120
programmersList: Array<cc_arduino_cli_commands_v1_common_pb.Programmer.AsObject>,
130121
debuggingSupported: boolean,
131122
identificationPropertiesList: Array<BoardIdentificationProperties.AsObject>,
132-
buildPropertiesList: Array<string>,
133123
}
134124
}
135125

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/board_pb.js

Lines changed: 3 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,7 @@ proto.cc.arduino.cli.commands.v1.BoardDetailsRequest.prototype.toObject = functi
498498
proto.cc.arduino.cli.commands.v1.BoardDetailsRequest.toObject = function(includeInstance, msg) {
499499
var f, obj = {
500500
instance: (f = msg.getInstance()) && cc_arduino_cli_commands_v1_common_pb.Instance.toObject(includeInstance, f),
501-
fqbn: jspb.Message.getFieldWithDefault(msg, 2, ""),
502-
doNotExpandBuildProperties: jspb.Message.getBooleanFieldWithDefault(msg, 3, false)
501+
fqbn: jspb.Message.getFieldWithDefault(msg, 2, "")
503502
};
504503

505504
if (includeInstance) {
@@ -545,10 +544,6 @@ proto.cc.arduino.cli.commands.v1.BoardDetailsRequest.deserializeBinaryFromReader
545544
var value = /** @type {string} */ (reader.readString());
546545
msg.setFqbn(value);
547546
break;
548-
case 3:
549-
var value = /** @type {boolean} */ (reader.readBool());
550-
msg.setDoNotExpandBuildProperties(value);
551-
break;
552547
default:
553548
reader.skipField();
554549
break;
@@ -593,13 +588,6 @@ proto.cc.arduino.cli.commands.v1.BoardDetailsRequest.serializeBinaryToWriter = f
593588
f
594589
);
595590
}
596-
f = message.getDoNotExpandBuildProperties();
597-
if (f) {
598-
writer.writeBool(
599-
3,
600-
f
601-
);
602-
}
603591
};
604592

605593

@@ -658,31 +646,13 @@ proto.cc.arduino.cli.commands.v1.BoardDetailsRequest.prototype.setFqbn = functio
658646
};
659647

660648

661-
/**
662-
* optional bool do_not_expand_build_properties = 3;
663-
* @return {boolean}
664-
*/
665-
proto.cc.arduino.cli.commands.v1.BoardDetailsRequest.prototype.getDoNotExpandBuildProperties = function() {
666-
return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 3, false));
667-
};
668-
669-
670-
/**
671-
* @param {boolean} value
672-
* @return {!proto.cc.arduino.cli.commands.v1.BoardDetailsRequest} returns this
673-
*/
674-
proto.cc.arduino.cli.commands.v1.BoardDetailsRequest.prototype.setDoNotExpandBuildProperties = function(value) {
675-
return jspb.Message.setProto3BooleanField(this, 3, value);
676-
};
677-
678-
679649

680650
/**
681651
* List of repeated fields within this message type.
682652
* @private {!Array<number>}
683653
* @const
684654
*/
685-
proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.repeatedFields_ = [10,11,13,15,16];
655+
proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.repeatedFields_ = [10,11,13,15];
686656

687657

688658

@@ -732,8 +702,7 @@ proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.toObject = function(includ
732702
cc_arduino_cli_commands_v1_common_pb.Programmer.toObject, includeInstance),
733703
debuggingSupported: jspb.Message.getBooleanFieldWithDefault(msg, 14, false),
734704
identificationPropertiesList: jspb.Message.toObjectList(msg.getIdentificationPropertiesList(),
735-
proto.cc.arduino.cli.commands.v1.BoardIdentificationProperties.toObject, includeInstance),
736-
buildPropertiesList: (f = jspb.Message.getRepeatedField(msg, 16)) == null ? undefined : f
705+
proto.cc.arduino.cli.commands.v1.BoardIdentificationProperties.toObject, includeInstance)
737706
};
738707

739708
if (includeInstance) {
@@ -832,10 +801,6 @@ proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.deserializeBinaryFromReade
832801
reader.readMessage(value,proto.cc.arduino.cli.commands.v1.BoardIdentificationProperties.deserializeBinaryFromReader);
833802
msg.addIdentificationProperties(value);
834803
break;
835-
case 16:
836-
var value = /** @type {string} */ (reader.readString());
837-
msg.addBuildProperties(value);
838-
break;
839804
default:
840805
reader.skipField();
841806
break;
@@ -969,13 +934,6 @@ proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.serializeBinaryToWriter =
969934
proto.cc.arduino.cli.commands.v1.BoardIdentificationProperties.serializeBinaryToWriter
970935
);
971936
}
972-
f = message.getBuildPropertiesList();
973-
if (f.length > 0) {
974-
writer.writeRepeatedString(
975-
16,
976-
f
977-
);
978-
}
979937
};
980938

981939

@@ -1349,43 +1307,6 @@ proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.prototype.clearIdentificat
13491307
};
13501308

13511309

1352-
/**
1353-
* repeated string build_properties = 16;
1354-
* @return {!Array<string>}
1355-
*/
1356-
proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.prototype.getBuildPropertiesList = function() {
1357-
return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 16));
1358-
};
1359-
1360-
1361-
/**
1362-
* @param {!Array<string>} value
1363-
* @return {!proto.cc.arduino.cli.commands.v1.BoardDetailsResponse} returns this
1364-
*/
1365-
proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.prototype.setBuildPropertiesList = function(value) {
1366-
return jspb.Message.setField(this, 16, value || []);
1367-
};
1368-
1369-
1370-
/**
1371-
* @param {string} value
1372-
* @param {number=} opt_index
1373-
* @return {!proto.cc.arduino.cli.commands.v1.BoardDetailsResponse} returns this
1374-
*/
1375-
proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.prototype.addBuildProperties = function(value, opt_index) {
1376-
return jspb.Message.addToRepeatedField(this, 16, value, opt_index);
1377-
};
1378-
1379-
1380-
/**
1381-
* Clears the list making it empty but non-null.
1382-
* @return {!proto.cc.arduino.cli.commands.v1.BoardDetailsResponse} returns this
1383-
*/
1384-
proto.cc.arduino.cli.commands.v1.BoardDetailsResponse.prototype.clearBuildPropertiesList = function() {
1385-
return this.setBuildPropertiesList([]);
1386-
};
1387-
1388-
13891310

13901311

13911312

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/common_pb.d.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,6 @@ export class Platform extends jspb.Message {
260260
getHelp(): HelpResources | undefined;
261261
setHelp(value?: HelpResources): Platform;
262262

263-
getIndexed(): boolean;
264-
setIndexed(value: boolean): Platform;
265-
266-
getMissingMetadata(): boolean;
267-
setMissingMetadata(value: boolean): Platform;
268-
269263

270264
serializeBinary(): Uint8Array;
271265
toObject(includeInstance?: boolean): Platform.AsObject;
@@ -291,8 +285,6 @@ export namespace Platform {
291285
deprecated: boolean,
292286
typeList: Array<string>,
293287
help?: HelpResources.AsObject,
294-
indexed: boolean,
295-
missingMetadata: boolean,
296288
}
297289
}
298290

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/common_pb.js

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,9 +1637,7 @@ proto.cc.arduino.cli.commands.v1.Platform.toObject = function(includeInstance, m
16371637
manuallyInstalled: jspb.Message.getBooleanFieldWithDefault(msg, 9, false),
16381638
deprecated: jspb.Message.getBooleanFieldWithDefault(msg, 10, false),
16391639
typeList: (f = jspb.Message.getRepeatedField(msg, 11)) == null ? undefined : f,
1640-
help: (f = msg.getHelp()) && proto.cc.arduino.cli.commands.v1.HelpResources.toObject(includeInstance, f),
1641-
indexed: jspb.Message.getBooleanFieldWithDefault(msg, 13, false),
1642-
missingMetadata: jspb.Message.getBooleanFieldWithDefault(msg, 14, false)
1640+
help: (f = msg.getHelp()) && proto.cc.arduino.cli.commands.v1.HelpResources.toObject(includeInstance, f)
16431641
};
16441642

16451643
if (includeInstance) {
@@ -1726,14 +1724,6 @@ proto.cc.arduino.cli.commands.v1.Platform.deserializeBinaryFromReader = function
17261724
reader.readMessage(value,proto.cc.arduino.cli.commands.v1.HelpResources.deserializeBinaryFromReader);
17271725
msg.setHelp(value);
17281726
break;
1729-
case 13:
1730-
var value = /** @type {boolean} */ (reader.readBool());
1731-
msg.setIndexed(value);
1732-
break;
1733-
case 14:
1734-
var value = /** @type {boolean} */ (reader.readBool());
1735-
msg.setMissingMetadata(value);
1736-
break;
17371727
default:
17381728
reader.skipField();
17391729
break;
@@ -1849,20 +1839,6 @@ proto.cc.arduino.cli.commands.v1.Platform.serializeBinaryToWriter = function(mes
18491839
proto.cc.arduino.cli.commands.v1.HelpResources.serializeBinaryToWriter
18501840
);
18511841
}
1852-
f = message.getIndexed();
1853-
if (f) {
1854-
writer.writeBool(
1855-
13,
1856-
f
1857-
);
1858-
}
1859-
f = message.getMissingMetadata();
1860-
if (f) {
1861-
writer.writeBool(
1862-
14,
1863-
f
1864-
);
1865-
}
18661842
};
18671843

18681844

@@ -2140,42 +2116,6 @@ proto.cc.arduino.cli.commands.v1.Platform.prototype.hasHelp = function() {
21402116
};
21412117

21422118

2143-
/**
2144-
* optional bool indexed = 13;
2145-
* @return {boolean}
2146-
*/
2147-
proto.cc.arduino.cli.commands.v1.Platform.prototype.getIndexed = function() {
2148-
return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 13, false));
2149-
};
2150-
2151-
2152-
/**
2153-
* @param {boolean} value
2154-
* @return {!proto.cc.arduino.cli.commands.v1.Platform} returns this
2155-
*/
2156-
proto.cc.arduino.cli.commands.v1.Platform.prototype.setIndexed = function(value) {
2157-
return jspb.Message.setProto3BooleanField(this, 13, value);
2158-
};
2159-
2160-
2161-
/**
2162-
* optional bool missing_metadata = 14;
2163-
* @return {boolean}
2164-
*/
2165-
proto.cc.arduino.cli.commands.v1.Platform.prototype.getMissingMetadata = function() {
2166-
return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 14, false));
2167-
};
2168-
2169-
2170-
/**
2171-
* @param {boolean} value
2172-
* @return {!proto.cc.arduino.cli.commands.v1.Platform} returns this
2173-
*/
2174-
proto.cc.arduino.cli.commands.v1.Platform.prototype.setMissingMetadata = function(value) {
2175-
return jspb.Message.setProto3BooleanField(this, 14, value);
2176-
};
2177-
2178-
21792119

21802120

21812121

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/compile_pb.d.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ export class CompileRequest extends jspb.Message {
9595
getSkipLibrariesDiscovery(): boolean;
9696
setSkipLibrariesDiscovery(value: boolean): CompileRequest;
9797

98-
getDoNotExpandBuildProperties(): boolean;
99-
setDoNotExpandBuildProperties(value: boolean): CompileRequest;
100-
10198

10299
serializeBinary(): Uint8Array;
103100
toObject(includeInstance?: boolean): CompileRequest.AsObject;
@@ -136,7 +133,6 @@ export namespace CompileRequest {
136133
signKey: string,
137134
encryptKey: string,
138135
skipLibrariesDiscovery: boolean,
139-
doNotExpandBuildProperties: boolean,
140136
}
141137
}
142138

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/compile_pb.js

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ proto.cc.arduino.cli.commands.v1.CompileRequest.toObject = function(includeInsta
155155
keysKeychain: jspb.Message.getFieldWithDefault(msg, 25, ""),
156156
signKey: jspb.Message.getFieldWithDefault(msg, 26, ""),
157157
encryptKey: jspb.Message.getFieldWithDefault(msg, 27, ""),
158-
skipLibrariesDiscovery: jspb.Message.getBooleanFieldWithDefault(msg, 28, false),
159-
doNotExpandBuildProperties: jspb.Message.getBooleanFieldWithDefault(msg, 29, false)
158+
skipLibrariesDiscovery: jspb.Message.getBooleanFieldWithDefault(msg, 28, false)
160159
};
161160

162161
if (includeInstance) {
@@ -293,10 +292,6 @@ proto.cc.arduino.cli.commands.v1.CompileRequest.deserializeBinaryFromReader = fu
293292
var value = /** @type {boolean} */ (reader.readBool());
294293
msg.setSkipLibrariesDiscovery(value);
295294
break;
296-
case 29:
297-
var value = /** @type {boolean} */ (reader.readBool());
298-
msg.setDoNotExpandBuildProperties(value);
299-
break;
300295
default:
301296
reader.skipField();
302297
break;
@@ -493,13 +488,6 @@ proto.cc.arduino.cli.commands.v1.CompileRequest.serializeBinaryToWriter = functi
493488
f
494489
);
495490
}
496-
f = message.getDoNotExpandBuildProperties();
497-
if (f) {
498-
writer.writeBool(
499-
29,
500-
f
501-
);
502-
}
503491
};
504492

505493

@@ -1034,24 +1022,6 @@ proto.cc.arduino.cli.commands.v1.CompileRequest.prototype.setSkipLibrariesDiscov
10341022
};
10351023

10361024

1037-
/**
1038-
* optional bool do_not_expand_build_properties = 29;
1039-
* @return {boolean}
1040-
*/
1041-
proto.cc.arduino.cli.commands.v1.CompileRequest.prototype.getDoNotExpandBuildProperties = function() {
1042-
return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 29, false));
1043-
};
1044-
1045-
1046-
/**
1047-
* @param {boolean} value
1048-
* @return {!proto.cc.arduino.cli.commands.v1.CompileRequest} returns this
1049-
*/
1050-
proto.cc.arduino.cli.commands.v1.CompileRequest.prototype.setDoNotExpandBuildProperties = function(value) {
1051-
return jspb.Message.setProto3BooleanField(this, 29, value);
1052-
};
1053-
1054-
10551025

10561026
/**
10571027
* List of repeated fields within this message type.

0 commit comments

Comments
 (0)