From abe0d18bf6c1da6b077aeb652169188e160ab06f Mon Sep 17 00:00:00 2001
From: Ondra Pelech <ondra.pelech@gmail.com>
Date: Thu, 12 Nov 2020 19:32:13 +0100
Subject: [PATCH] Upgrade VS Code Metals, the Scala language client, to version
 1.9.6 (#685)

Signed-off-by: sideeffffect <ondra.pelech@gmail.com>
---
 .../metals/{1.9.4 => 1.9.6}/meta.yaml         | 26 ++++++++-----------
 v3/plugins/scalameta/metals/latest.txt        |  2 +-
 vscode-extensions.json                        |  4 +--
 3 files changed, 14 insertions(+), 18 deletions(-)
 rename v3/plugins/scalameta/metals/{1.9.4 => 1.9.6}/meta.yaml (57%)

diff --git a/v3/plugins/scalameta/metals/1.9.4/meta.yaml b/v3/plugins/scalameta/metals/1.9.6/meta.yaml
similarity index 57%
rename from v3/plugins/scalameta/metals/1.9.4/meta.yaml
rename to v3/plugins/scalameta/metals/1.9.6/meta.yaml
index e4f87f4f4..9ff0748b4 100644
--- a/v3/plugins/scalameta/metals/1.9.4/meta.yaml
+++ b/v3/plugins/scalameta/metals/1.9.6/meta.yaml
@@ -1,31 +1,27 @@
 apiVersion: v2
 publisher: scalameta
 name: metals
-version: 1.9.4
+version: 1.9.6
 type: VS Code extension
 displayName: Scala (Metals)
 title: Scala language server with rich IDE features
 description: This plug-in provides support for Scala development via the Metals language server.
-icon: https://raw.githubusercontent.com/scalameta/metals-vscode/v1.9.4/images/logo.png
+icon: https://raw.githubusercontent.com/scalameta/metals-vscode/v1.9.6/images/logo.png
 repository: https://github.com/scalameta/metals-vscode
 category: Language
-firstPublicationDate: "2020-09-21"
+firstPublicationDate: "2020-11-10"
 spec:
   containers:
-    - image: "quay.io/eclipse/che-sidecar-scala:0.9.0-b92a5f9"
+    - image: "quay.io/eclipse/che-plugin-sidecar:scala-0275d91"
       name: vscode-metals
       memoryLimit: "1500Mi"
       volumes:
-      - name: sbt
-        mountPath: "/home/theia/.sbt"
-      - name: ivy2
-        mountPath: "/home/theia/.ivy2"
-      - name: coursier
-        mountPath: "/home/theia/.cache/coursier"
-      - name: metals
-        mountPath: "/home/theia/.cache/metals"
-      - name: bloop
-        mountPath: "/home/theia/.cache/bloop"
+        - name: sbt
+          mountPath: "/home/theia/.sbt"
+        - name: ivy2
+          mountPath: "/home/theia/.ivy2"
+        - name: cache
+          mountPath: "/home/theia/.cache"
   extensions:
     - https://github.com/scala/vscode-scala-syntax/releases/download/0.4.5/scala-lang.scala-0.4.5.vsix
-    - https://github.com/scalameta/metals-vscode/releases/download/v1.9.4/scalameta.metals-1.9.4.vsix
+    - https://github.com/scalameta/metals-vscode/releases/download/v1.9.6/scalameta.metals-1.9.6.vsix
diff --git a/v3/plugins/scalameta/metals/latest.txt b/v3/plugins/scalameta/metals/latest.txt
index d615fd0c0..7bc1c4047 100644
--- a/v3/plugins/scalameta/metals/latest.txt
+++ b/v3/plugins/scalameta/metals/latest.txt
@@ -1 +1 @@
-1.9.4
+1.9.6
diff --git a/vscode-extensions.json b/vscode-extensions.json
index 9205f9381..2a5769a50 100644
--- a/vscode-extensions.json
+++ b/vscode-extensions.json
@@ -344,9 +344,9 @@
     },
     {
       "repository": "https://github.com/scalameta/metals-vscode",
-      "revision": "v1.9.4",
+      "revision": "v1.9.6",
       "sidecar": {
-        "image": "quay.io/eclipse/che-sidecar-scala:0.9.0-b92a5f9",
+        "image": "quay.io/eclipse/che-plugin-sidecar:scala-0275d91",
         "source": {
           "repository": "https://github.com/che-dockerfiles/che-sidecar-scala"
         }