Drop down on Scala 2.12 and 2.13 because of sbt-sourcegraph entanglement

sourcegraph · Apr 15, 2024 · 418a4f5 · 418a4f5
1 parent 5977aa6
commit 418a4f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala
@@ -79,7 +79,7 @@ abstract class BaseBuildToolSuite extends MopedSuite(ScipJava.app) {
       targetRoot: Option[String] = None,
       tools: List[Tool] = Nil
   ): Unit = {
-    val minJDK = Tool.minimalSupportedJdk(tools)
+    val minJDK = Tool.minimumSupportedJdk(tools)
     val maxJDK = Tool.maximumSupportedJdk(tools).getOrElse(Int.MaxValue)
     val externalJDKVersion = BaseBuildToolSuite.externalJavaVersion
 

diff --git a/tests/buildTools/src/test/scala/tests/SbtBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/SbtBuildToolSuite.scala
@@ -7,7 +7,7 @@ abstract class SbtBuildToolSuite(sbt: Tool.SBT) extends BaseBuildToolSuite {
   import Tool._
 
   for {
-    scala <- List(Scala211, Scala212, Scala213, Scala3)
+    scala <- List(Scala211, Scala2_12_12, Scala2_13_8, Scala3)
   } yield {
     checkBuild(
       s"basic-${sbt.name}-${scala.name}",

diff --git a/tests/buildTools/src/test/scala/tests/Tool.scala b/tests/buildTools/src/test/scala/tests/Tool.scala
@@ -25,18 +25,18 @@ sealed abstract class Tool(
 object Tool {
   import JVMSupport._
 
-  def minimalSupportedJdk(tools: Seq[Tool]): Int =
+  def minimumSupportedJdk(tools: Seq[Tool]): Int =
     tools.map(_.support.minJava).minOption.getOrElse(8)
 
   def maximumSupportedJdk(tools: Seq[Tool]): Option[Int] =
     tools.flatMap(_.support.maxJava).minOption
-  
+
   // See https://docs.gradle.org/current/userguide/compatibility.html
   sealed abstract class Gradle(version: String, support: JVMSupport)
       extends Tool("gradle", version, support)
   case object Gradle8 extends Gradle("8.7", atMostJava(21))
   case object Gradle7 extends Gradle("7.6.1", atMostJava(17))
-  case object Gradle6 extends Gradle("6.7", atMostJava(11))
+  case object Gradle6 extends Gradle("6.8.3", atMostJava(11))
   case object Gradle5 extends Gradle("5.6.4", atMostJava(11))
   case object Gradle3 extends Gradle("3.3", atMostJava(8))
   case object Gradle2 extends Gradle("2.2.1", atMostJava(8))