From 2b2ce43d7e03eee5433246155afec1ec76cd2e15 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Sun, 12 Jan 2025 17:31:34 +0100 Subject: [PATCH] bugfix: Don't run debug tests on Scala 2.13.15 --- .../internal/metals/debug/server/testing/TestInternals.scala | 3 ++- .../src/test/scala/tests/mill/MillBreakpointDapSuite.scala | 3 +++ .../src/test/scala/tests/mill/MillDebugDiscoverySuite.scala | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/metals/src/main/scala/scala/meta/internal/metals/debug/server/testing/TestInternals.scala b/metals/src/main/scala/scala/meta/internal/metals/debug/server/testing/TestInternals.scala index f4fa8d23633..398e6df165b 100644 --- a/metals/src/main/scala/scala/meta/internal/metals/debug/server/testing/TestInternals.scala +++ b/metals/src/main/scala/scala/meta/internal/metals/debug/server/testing/TestInternals.scala @@ -16,6 +16,7 @@ import sbt.testing.Fingerprint import sbt.testing.Framework import sbt.testing.Runner import sbt.testing.SubclassFingerprint +import scala.meta.internal.metals.BuildInfo final case class FingerprintInfo[+Print <: Fingerprint]( name: String, @@ -27,7 +28,7 @@ final case class FingerprintInfo[+Print <: Fingerprint]( object TestInternals { private final val sbtOrg = "org.scala-sbt" private final val testAgentId = "test-agent" - private final val testAgentVersion = "1.8.0" + private final val testAgentVersion = BuildInfo.sbtVersion lazy val testAgentFiles: List[Path] = { val dependency = Dependency.of(sbtOrg, testAgentId, testAgentVersion) diff --git a/tests/slow/src/test/scala/tests/mill/MillBreakpointDapSuite.scala b/tests/slow/src/test/scala/tests/mill/MillBreakpointDapSuite.scala index 86389969258..16892ead4b5 100644 --- a/tests/slow/src/test/scala/tests/mill/MillBreakpointDapSuite.scala +++ b/tests/slow/src/test/scala/tests/mill/MillBreakpointDapSuite.scala @@ -13,6 +13,9 @@ class MillBreakpointDapSuite MillBuildLayout, ) { + // TODO https://github.com/scalameta/metals/issues/7108 + override def scalaVersion = "2.13.15" + // mill sometimes hangs and doesn't return main classes override protected val retryTimes: Int = 2 diff --git a/tests/slow/src/test/scala/tests/mill/MillDebugDiscoverySuite.scala b/tests/slow/src/test/scala/tests/mill/MillDebugDiscoverySuite.scala index 77258bc2afa..ce7ae4d09bd 100644 --- a/tests/slow/src/test/scala/tests/mill/MillDebugDiscoverySuite.scala +++ b/tests/slow/src/test/scala/tests/mill/MillDebugDiscoverySuite.scala @@ -28,6 +28,8 @@ class MillDebugDiscoverySuite // mill sometimes hangs and doesn't return main classes override protected val retryTimes: Int = 2 + // TODO https://github.com/scalameta/metals/issues/7108 + override def scalaVersion = "2.13.15" // Needs LTS 3.3.5 for (scala <- List(scalaVersion, "3.3.3")) {