From a632104495686338ace9a04b92b45d7a7cdbdafd Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Wed, 27 Sep 2023 15:34:16 +0200 Subject: [PATCH] chore: Drop Scala 2.12 --- project/Common.scala | 6 ++---- project/Dependencies.scala | 3 +-- project/project-info.conf | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/project/Common.scala b/project/Common.scala index de672b728..7925f2258 100644 --- 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 index 35ec70017..fcfc44c1f 100644 --- 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 index ecac28998..a451ad07d 100644 --- 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: {