Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Drop Scala 2.12 #1195

Merged
merged 1 commit into from
Sep 27, 2023
Merged

chore: Drop Scala 2.12 #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions project/Common.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion project/project-info.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down
Loading