chore: Drop Scala 2.12

akka · Sep 27, 2023 · a632104 · a632104
1 parent 97c04b1
commit a632104
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/project/Common.scala b/project/Common.scala
@@ -55,9 +55,7 @@ object Common extends AutoPlugin {
           "-unchecked",
           "-deprecation"
         )
-        if (scalaVersion.value == Dependencies.Scala212)
-          scalacOptionsBase ++: Seq("-Xfuture", "-Xfatal-warnings", "-Xlint", "-Ywarn-dead-code")
-        else if (scalaVersion.value == Dependencies.Scala213)
+        if (scalaVersion.value == Dependencies.Scala213)
           scalacOptionsBase ++: Seq("-Xlint", "-Ywarn-dead-code")
         else
           scalacOptionsBase
@@ -70,7 +68,7 @@ object Common extends AutoPlugin {
           else Seq("--release", "8")
         ),
       scalacOptions ++= (
-          if (isJdk8 || scalaVersion.value == Dependencies.Scala212) Seq.empty
+          if (isJdk8) Seq.empty
           else Seq("--release", "8")
         ),
       doc / javacOptions := Nil,

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -3,10 +3,9 @@ import Keys._
 
 object Dependencies {
 
-  val Scala212 = "2.12.18"
   val Scala213 = "2.13.11"
   val Scala3 = "3.3.1"
-  val CrossScalaVersions = Seq(Scala213, Scala212, Scala3)
+  val CrossScalaVersions = Seq(Scala213, Scala3)
 
   // Align the versions in integration-test/kubernetes-api-java/pom.xml
   val AkkaVersion = "2.8.2"

diff --git a/project/project-info.conf b/project/project-info.conf
@@ -1,6 +1,6 @@
 project-info {
   version: "current"
-  scala-versions: ["2.11", "2.12"]
+  scala-versions: ["2.13", "3.3"]
   shared-info {
     jdk-versions: ["Adopt OpenJDK 8 with Hotspot", "Adopt OpenJDK 11 with Hotspot"]
     snapshots: {