diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index de5d380a..1f557c7e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,9 +18,6 @@ jobs: matrix: include: # cover relevant combinations when combined with the matrix Yugabyte tests - - { scalaVersion: "2.12", jdkVersion: "1.8.0", jvmName: "temurin:1.8.0", extraOpts: '', testCmd: "test" } - # { scalaVersion: "2.12", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test"} - - { scalaVersion: "2.12", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"} # { scalaVersion: "2.13", jdkVersion: "1.8.0", jvmName: "temurin:1.8.0", extraOpts: '', testCmd: "test"} # { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test"} - { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"} @@ -74,9 +71,6 @@ jobs: matrix: include: # cover relevant combinations when combined with the matrix Postgres tests - # { scalaVersion: "2.12", jdkVersion: "1.8.0", jvmName: "temurin:1.8.0", extraOpts: '', testCmd: "test" } - - { scalaVersion: "2.12", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test" } - # { scalaVersion: "2.12", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test" } - { scalaVersion: "2.13", jdkVersion: "1.8.0", jvmName: "temurin:1.8.0", extraOpts: '', testCmd: "test" } - { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test" } # { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test" } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 595c2c33..4befe442 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,9 +6,8 @@ import sbt._ object Dependencies { val Scala213 = "2.13.12" - val Scala212 = "2.12.18" val Scala3 = "3.3.1" - val Scala2Versions = Seq(Scala213, Scala212) + val Scala2Versions = Seq(Scala213) val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3 val AkkaVersion = System.getProperty("override.akka.version", "2.9.0-M1") val AkkaVersionInDocs = AkkaVersion.take(3)