From 4d5a046aa85d964723c6078b7f0e79fbc4d6cc20 Mon Sep 17 00:00:00 2001
From: Akos Kitta <kittaakos@typefox.io>
Date: Mon, 7 Dec 2020 10:49:49 +0100
Subject: [PATCH] Switched to the '0.14.0' CLI.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
---
 .../data/cli/schema/arduino-cli.schema.json          | 12 ++++++++++++
 arduino-ide-extension/package.json                   |  2 +-
 arduino-ide-extension/scripts/generate-protocol.js   |  6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/arduino-ide-extension/data/cli/schema/arduino-cli.schema.json b/arduino-ide-extension/data/cli/schema/arduino-cli.schema.json
index a29d08be..8ff073ee 100644
--- a/arduino-ide-extension/data/cli/schema/arduino-cli.schema.json
+++ b/arduino-ide-extension/data/cli/schema/arduino-cli.schema.json
@@ -119,6 +119,18 @@
         "additionalProperties": false
       },
       "additionalProperties": false
+    },
+    "library": {
+      "type": "object",
+      "description": "Library Configuration",
+      "properties": {
+        "enable_unsafe_install": {
+          "type": "boolean",
+          "description": "Set to 'true' to enable the use of the '--git-url' and '--zip-file' flags with 'arduino-cli lib install' These are considered 'unsafe' installation methods because they allow installing files that have not passed through the Library Manager submission process."
+        },
+        "additionalProperties": false
+      },
+      "additionalProperties": false
     }
   },
   "additionalProperties": false
diff --git a/arduino-ide-extension/package.json b/arduino-ide-extension/package.json
index 986b384d..580810be 100644
--- a/arduino-ide-extension/package.json
+++ b/arduino-ide-extension/package.json
@@ -120,7 +120,7 @@
   ],
   "arduino": {
     "cli": {
-      "version": "20201201"
+      "version": "0.14.0"
     }
   }
 }
diff --git a/arduino-ide-extension/scripts/generate-protocol.js b/arduino-ide-extension/scripts/generate-protocol.js
index e707125d..4293966b 100644
--- a/arduino-ide-extension/scripts/generate-protocol.js
+++ b/arduino-ide-extension/scripts/generate-protocol.js
@@ -66,12 +66,12 @@
     const { platform } = process;
     const build = path.join(__dirname, '..', 'build');
     const cli = path.join(build, `arduino-cli${platform === 'win32' ? '.exe' : ''}`);
-    const rawVersion = shell.exec(`${cli} version`).trim();
-    if (!rawVersion) {
+    const jsonVersion = shell.exec(`${cli} version --format json`).trim();
+    if (!jsonVersion) {
         shell.echo(`Could not retrieve the CLI version from ${cli}.`);
         shell.exit(1);
     }
-    const version = rawVersion.substring(rawVersion.lastIndexOf('Commit:') + 'Commit:'.length).trim();
+    const version = JSON.parse(jsonVersion).VersionString;
     if (version) {
         shell.echo(`>>> Checking out version: ${version}...`);
         if (shell.exec(`git -C ${repository} checkout ${version} -b ${version}`).code !== 0) {