chore: Add support for Scala 2.13.16

scalameta · Jan 12, 2025 · e46bc26 · e46bc26
1 parent 70eb623
commit e46bc26
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 28 deletions.
diff --git a/bin/test-release.sh b/bin/test-release.sh
@@ -15,6 +15,7 @@ coursier fetch \
   org.scalameta:mtags_2.13.13:$version \
   org.scalameta:mtags_2.13.14:$version \
   org.scalameta:mtags_2.13.15:$version \
+  org.scalameta:mtags_2.13.16:$version \
   org.scalameta:mtags_2.12.17:$version \
   org.scalameta:mtags_2.12.18:$version \
   org.scalameta:mtags_2.12.19:$version \

diff --git a/project/V.scala b/project/V.scala
@@ -4,7 +4,7 @@ object V {
   val scala210 = "2.10.7"
   val scala211 = "2.11.12"
   val scala212 = "2.12.20"
-  val scala213 = "2.13.15"
+  val scala213 = "2.13.16"
   val lastPublishedScala3 = "3.3.3"
   val scala3 = "3.3.4"
   val scala3ForSBT2 = "3.6.2"
@@ -152,6 +152,7 @@ object V {
     "2.13.12",
     "2.13.13",
     "2.13.14",
+    "2.13.15",
   )
 
   def minimumSupportedSbtVersion = {

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala
@@ -558,7 +558,8 @@ class CompletionDocSuite extends BaseCompletionSuite {
             |Try[T](r: => T): Try[T]""".stripMargin,
       "2.13.13" -> baseScala21313Docs,
       "2.13.14" -> baseScala21313Docs,
-      "2.13.15" -> baseScala21313Docs
+      "2.13.15" -> baseScala21313Docs,
+      "2.13.16" -> baseScala21313Docs
     )
   )
 

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionScalaCliSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionScalaCliSuite.scala
@@ -115,7 +115,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
   check(
     "plugin".tag(
       IgnoreScalaVersion(version =>
-        Set("2.13.15")(version) ||
+        Set("2.13.16")(version) ||
           version.contains(
             "NIGHTLY"
           ) || version.contains(

diff --git a/tests/cross/src/test/scala/tests/pc/SignatureHelpDocSuite.scala b/tests/cross/src/test/scala/tests/pc/SignatureHelpDocSuite.scala
@@ -200,6 +200,7 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
       "2.13.13" -> docsAfter21313,
       "2.13.14" -> docsAfter21313,
       "2.13.15" -> docsAfter21313,
+      "2.13.16" -> docsAfter21313,
       "3" ->
         """|Applies the given binary operator `op` to the given initial value `z` and all
            | elements of this collection, going left to right. Returns the initial value if this collection

diff --git a/tests/slow/src/test/scala/tests/gradle/GradleLspSuite.scala b/tests/slow/src/test/scala/tests/gradle/GradleLspSuite.scala
@@ -483,9 +483,9 @@ class GradleLspSuite extends BaseImportSuite("gradle-import") {
       _ = assertNoDiff(
         client.workspaceDiagnostics,
         """
-          |src/main/scala/warning/Warning.scala:1:1: error: Unused import
+          |src/main/scala/warning/Warning.scala:1:25: error: Unused import
           |import scala.concurrent.Future // unused
-          |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+          |                        ^^^^^^
         """.stripMargin,
       )
       // we should still have references despite fatal warning

diff --git a/tests/slow/src/test/scala/tests/maven/MavenLspSuite.scala b/tests/slow/src/test/scala/tests/maven/MavenLspSuite.scala
@@ -236,9 +236,9 @@ class MavenLspSuite extends BaseImportSuite("maven-import") {
       _ = assertNoDiff(
         client.workspaceDiagnostics,
         """
-          |src/main/scala/warning/Warning.scala:1:1: error: Unused import
+          |src/main/scala/warning/Warning.scala:1:25: error: Unused import
           |import scala.concurrent.Future // unused
-          |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+          |                        ^^^^^^
         """.stripMargin,
       )
       // we should still have references despite fatal warning

diff --git a/tests/slow/src/test/scala/tests/mill/MillLspSuite.scala b/tests/slow/src/test/scala/tests/mill/MillLspSuite.scala
@@ -157,9 +157,9 @@ class MillLspSuite extends BaseImportSuite("mill-import") {
       _ = assertNoDiff(
         client.workspaceDiagnostics,
         """
-          |foo/src/Warning.scala:1:1: error: Unused import
+          |foo/src/Warning.scala:1:25: error: Unused import
           |import scala.concurrent.Future // unused
-          |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+          |                        ^^^^^^
         """.stripMargin,
       )
       // we should still have references despite fatal warning

diff --git a/tests/slow/src/test/scala/tests/sbt/SbtBloopLspSuite.scala b/tests/slow/src/test/scala/tests/sbt/SbtBloopLspSuite.scala
@@ -469,9 +469,9 @@ class SbtBloopLspSuite
       _ = assertNoDiff(
         client.workspaceDiagnostics,
         """
-          |src/main/scala/warning/Warning.scala:1:1: error: Unused import
+          |src/main/scala/warning/Warning.scala:1:25: error: Unused import
           |import scala.concurrent.Future // unused
-          |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+          |                        ^^^^^^
         """.stripMargin,
       )
       // we should still have references despite fatal warning

diff --git a/tests/unit/src/test/scala/tests/DiagnosticsLspSuite.scala b/tests/unit/src/test/scala/tests/DiagnosticsLspSuite.scala
@@ -43,21 +43,21 @@ class DiagnosticsLspSuite extends BaseLspSuite("diagnostics") {
       _ = assertNoDiff(client.workspaceDiagnostics, "")
       _ <- server.didOpen("a/src/main/scala/a/Main.scala")
       exampleDiagnostics = {
-        """|a/src/main/scala/a/Example.scala:2:1: warning: Unused import
+        """|a/src/main/scala/a/Example.scala:2:29: warning: Unused import
            |import java.util.concurrent.Future // unused
-           |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-           |a/src/main/scala/a/Example.scala:3:1: warning: Unused import
+           |                            ^^^^^^
+           |a/src/main/scala/a/Example.scala:3:19: warning: Unused import
            |import scala.util.Failure // unused
-           |^^^^^^^^^^^^^^^^^^^^^^^^^
+           |                  ^^^^^^^
            |""".stripMargin
       }
       mainDiagnostics = {
-        """|a/src/main/scala/a/Main.scala:2:1: warning: Unused import
+        """|a/src/main/scala/a/Main.scala:2:29: warning: Unused import
            |import java.util.concurrent.Future // unused
-           |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-           |a/src/main/scala/a/Main.scala:3:1: warning: Unused import
+           |                            ^^^^^^
+           |a/src/main/scala/a/Main.scala:3:19: warning: Unused import
            |import scala.util.Failure // unused
-           |^^^^^^^^^^^^^^^^^^^^^^^^^
+           |                  ^^^^^^^
            |""".stripMargin
       }
       _ = assertNoDiff(
@@ -66,12 +66,12 @@ class DiagnosticsLspSuite extends BaseLspSuite("diagnostics") {
       )
       _ <- server.didOpen("b/src/main/scala/a/MainSuite.scala")
       testDiagnostics = {
-        """|b/src/main/scala/a/MainSuite.scala:2:1: warning: Unused import
+        """|b/src/main/scala/a/MainSuite.scala:2:29: warning: Unused import
            |import java.util.concurrent.Future // unused
-           |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-           |b/src/main/scala/a/MainSuite.scala:3:1: warning: Unused import
+           |                            ^^^^^^
+           |b/src/main/scala/a/MainSuite.scala:3:19: warning: Unused import
            |import scala.util.Failure // unused
-           |^^^^^^^^^^^^^^^^^^^^^^^^^
+           |                  ^^^^^^^
            |""".stripMargin
       }
       _ = assertNoDiff(

diff --git a/tests/unit/src/test/scala/tests/QuickBuildSuite.scala b/tests/unit/src/test/scala/tests/QuickBuildSuite.scala
@@ -53,9 +53,9 @@ class QuickBuildSuite extends BaseLspSuite(s"quick-build") {
       _ <- server.didOpen("b/src/main/scala/b/B.scala")
       _ = assertNoDiff(
         client.workspaceDiagnostics,
-        """|b/src/main/scala/b/B.scala:3:1: warning: Unused import
+        """|b/src/main/scala/b/B.scala:3:19: warning: Unused import
            |import scala.util.Success
-           |^^^^^^^^^^^^^^^^^^^^^^^^^
+           |                  ^^^^^^^
         """.stripMargin,
       )
       _ <- server.didOpen("a/src/main/scala/a/A.scala")

diff --git a/tests/unit/src/test/scala/tests/codeactions/OrganizeImportsLspSuite.scala b/tests/unit/src/test/scala/tests/codeactions/OrganizeImportsLspSuite.scala
@@ -125,7 +125,7 @@ class OrganizeImportsLspSuite
       txt.replace(
         """|import scala.concurrent.ExecutionContext.global""".stripMargin,
         """|import scala.concurrent.ExecutionContext.global
-           |import java.nio.file.ClassDoNotExist
+           |import java.nio.files.Files
            |// comment""".stripMargin,
       )
     },

diff --git a/tests/unit/src/test/scala/tests/scalafix/ScalafixProviderLspSuite.scala b/tests/unit/src/test/scala/tests/scalafix/ScalafixProviderLspSuite.scala
@@ -60,9 +60,9 @@ class ScalafixProviderLspSuite extends BaseLspSuite("scalafix-provider") {
       _ = assertNoDiff(
         // we need warnings for scalafix rules
         client.workspaceDiagnostics,
-        """|a/src/main/scala/Main.scala:2:1: warning: Unused import
+        """|a/src/main/scala/Main.scala:2:16: warning: Unused import
            |import java.io.File
-           |^^^^^^^^^^^^^^^^^^^
+           |               ^^^^
            |a/src/main/scala/Main.scala:7:15: warning: private val notUsed in object Main is never used
            |  private val notUsed = 123 
            |              ^^^^^^^