Merge pull request #1255 from scala-steward/update/scala-library-2.13.12

Update scala-library, scala-reflect to 2.13.12
almond-sh · Oct 17, 2023 · 57d72b3 · 57d72b3
2 parents d4fcef1 + aa12a59
commit 57d72b3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git 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/...ala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala b/...ala/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
@@ -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"
@@ -88,30 +88,20 @@ 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",
-    "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) =