From b38e5ea13912afa127db661ba94ccddf5764d2b2 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 17 Oct 2023 00:28:10 +0200 Subject: [PATCH 1/3] Drop support for Scala versions that Metals doesn't support anymore It's an issue for us here because of metabrowse and inspections support --- project/deps.sc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/project/deps.sc b/project/deps.sc index c7e1fc5f2..09216411e 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -97,21 +97,10 @@ object ScalaVersions { scala213, "2.13.10", "2.13.9", - "2.13.8", - "2.13.7", - "2.13.6", - "2.13.5", - "2.13.4", - "2.13.3", scala212, "2.12.17", "2.12.16", - "2.12.15", - "2.12.14", - "2.12.13", - "2.12.12", - "2.12.11", - "2.12.10" + "2.12.15" ).distinct def binary(sv: String) = From e00b6240e0d263dcb7e4c4bfd626e5ea6f0ae540 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 16 Oct 2023 23:25:11 +0200 Subject: [PATCH 2/3] Update metabrowse to 0.2.12, revert scalameta back to 4.8.3 Same scalaemta version that metabrowse and mtags pull --- .../almond/internals/ScalaInterpreterInspections.scala | 4 ++-- project/deps.sc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/scala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala b/modules/scala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala index 9dcde9911..f29c857bd 100644 --- a/modules/scala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala +++ b/modules/scala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala @@ -8,7 +8,7 @@ import almond.logger.{Logger, LoggerContext} import ammonite.runtime.Frame import ammonite.util.Util.newLine import scala.meta.dialects -import scala.meta.internal.metals.Docstrings +import scala.meta.internal.metals.{Docstrings, EmptyReportContext} import scala.meta.internal.mtags.MtagsEnrichments._ import scala.meta.internal.mtags.{IndexingExceptions, OnDemandSymbolIndex} import scala.meta.internal.semanticdb.scalac.SemanticdbOps @@ -56,7 +56,7 @@ final class ScalaInterpreterInspections( dialects.Scala213 else dialects.Scala212 - val index = OnDemandSymbolIndex.empty() + val index = OnDemandSymbolIndex.empty()(EmptyReportContext) for (p <- sourcePaths) try index.addSourceJar(AbsolutePath(p), dialect) catch { diff --git a/project/deps.sc b/project/deps.sc index 09216411e..25aaaea41 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -64,11 +64,11 @@ object Deps { def jvmRepr = ivy"com.github.jupyter:jvm-repr:0.4.0" def mdoc = ivy"org.scalameta::mdoc:2.3.8" def munit = ivy"org.scalameta::munit:0.7.29" - def metabrowseServer = ivy"org.scalameta:::metabrowse-server:0.2.10" + def metabrowseServer = ivy"org.scalameta:::metabrowse-server:0.2.12" def osLib = ivy"com.lihaoyi::os-lib:0.9.1" def pprint = ivy"com.lihaoyi::pprint:0.8.1" def scalafmtDynamic = ivy"org.scalameta::scalafmt-dynamic:${Versions.scalafmt}" - def scalameta = ivy"org.scalameta::scalameta:4.8.10" + def scalameta = ivy"org.scalameta::scalameta:4.8.3" def scalaparse = ivy"com.lihaoyi::scalaparse:3.0.2" def scalapy = ivy"me.shadaj::scalapy-core:0.5.2" def scalaReflect(sv: String) = ivy"org.scala-lang:scala-reflect:$sv" From aa12a59e8d79aa996ece970e59b1e7b0178bb0e1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 Sep 2023 12:46:03 +0000 Subject: [PATCH 3/3] Update scala-library, scala-reflect to 2.13.12 --- .github/workflows/ci.yml | 6 +++--- project/deps.sc | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1b891487..889283de3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,14 +46,14 @@ jobs: matrix: OS: [ubuntu-latest] JDK: [8] - SCALA: [2.12.17, 2.12.18, 2.13.10, 2.13.11, 3.3.0] + SCALA: [2.12.17, 2.12.18, 2.13.11, 2.13.12, 3.3.0] include: - OS: windows-latest JDK: 8 - SCALA: 2.13.11 + SCALA: 2.13.12 - OS: macos-latest JDK: 8 - SCALA: 2.13.11 + SCALA: 2.13.12 - OS: ubuntu-latest JDK: 17 SCALA: 2.12.18 diff --git a/project/deps.sc b/project/deps.sc index 25aaaea41..a4a6104b9 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -88,13 +88,14 @@ object ScalaVersions { def scala3Latest = "3.3.1" def scala3Compat = "3.3.0" def cross2_3Version(sv: String) = "2.13.11" - def scala213 = "2.13.11" + def scala213 = "2.13.12" def scala212 = "2.12.18" val binaries = Seq(scala3Compat, scala213, scala212) val all = Seq( scala3Latest, scala3Compat, scala213, + "2.13.11", "2.13.10", "2.13.9", scala212,