Update scala-library, scala-reflect to 2.13.12

Co-Authored-By: Alexandre Archambault <[email protected]>

.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

modules/scala/scala-interpreter/src/main/scala-2.13.11-/almond/internals/ScalaInterpreterInspectionsUtil.scala

@@ -0,0 +1,10 @@
+package almond.internals
+
+import scala.meta.internal.mtags.OnDemandSymbolIndex
+
+object ScalaInterpreterInspectionsUtil {
+
+  def onDemandSymbolIndex(): OnDemandSymbolIndex =
+    OnDemandSymbolIndex.empty()
+
+}

modules/scala/scala-interpreter/src/main/scala-2.13.12+/almond/internals/ScalaInterpreterInspectionsUtil.scala

@@ -0,0 +1,11 @@
+package almond.internals
+
+import scala.meta.internal.metals.EmptyReportContext
+import scala.meta.internal.mtags.OnDemandSymbolIndex
+
+object ScalaInterpreterInspectionsUtil {
+
+  def onDemandSymbolIndex(): OnDemandSymbolIndex =
+    OnDemandSymbolIndex.empty()(EmptyReportContext)
+
+}

modules/scala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala

@@ -9,8 +9,8 @@ import ammonite.runtime.Frame
 import ammonite.util.Util.newLine
 import scala.meta.dialects
 import scala.meta.internal.metals.Docstrings
+import scala.meta.internal.mtags.IndexingExceptions
 import scala.meta.internal.mtags.MtagsEnrichments._
-import scala.meta.internal.mtags.{IndexingExceptions, OnDemandSymbolIndex}
 import scala.meta.internal.semanticdb.scalac.SemanticdbOps
 import scala.meta.io.AbsolutePath
 import scala.meta.pc.SymbolDocumentation
@@ -56,7 +56,7 @@ final class ScalaInterpreterInspections(
           dialects.Scala213
         else
           dialects.Scala212
-      val index = OnDemandSymbolIndex.empty()
+      val index = ScalaInterpreterInspectionsUtil.onDemandSymbolIndex()
       for (p <- sourcePaths)
         try index.addSourceJar(AbsolutePath(p), dialect)
         catch {

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",
     "2.13.8",

project/settings.sc

@@ -41,11 +41,23 @@ lazy val buildVersion = {
 trait CrossSbtModule extends mill.scalalib.SbtModule with mill.scalalib.CrossModuleBase { outer =>
 
   override def sources = T.sources {
+    val sv = scalaVersion()
+    val extraDirs = {
+      val dirNames =
+        if (sv.startsWith("2.13."))
+          if (sv.stripPrefix("2.13.").takeWhile(_.isDigit).toInt <= 11) Seq("scala-2.13.11-")
+          else Seq("scala-2.13.12+")
+        else
+          Nil
+      dirNames.map(millSourcePath / "src" / "main" / _).map(PathRef(_))
+    }
+
     super.sources() ++
       mill.scalalib.CrossModuleBase.scalaVersionPaths(
-        scalaVersion(),
+        sv,
         s => millSourcePath / 'src / 'main / s"scala-$s"
-      )
+      ) ++
+      extraDirs
 
   }
 }