From c339697889af4580544d81f6624711c11e2fdd40 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Mon, 2 Oct 2023 13:59:25 +0200 Subject: [PATCH] chore: Drop Scala 2.12 (#1026) --- .github/workflows/checks.yml | 2 +- .github/workflows/dependency-submission.yml | 2 +- project/AkkaDisciplinePlugin.scala | 3 --- project/Dependencies.scala | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3196a9b60..a372411e2 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -73,7 +73,7 @@ jobs: with: jvm: temurin:1.11 - - name: Compile all code with fatal warnings for Java 11, Scala 2.12, Scala 2.13 and Scala 3 + - name: Compile all code with fatal warnings for Java 11, Scala 2.13 and Scala 3 run: sbt "clean ; +IntegrationTest/compile" check-docs: diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml index c90b8e770..270e11e27 100644 --- a/.github/workflows/dependency-submission.yml +++ b/.github/workflows/dependency-submission.yml @@ -29,5 +29,5 @@ jobs: # v2.1.0 uses: scalacenter/sbt-dependency-submission@573f2f9ac18dd26794bd0c5b26b71e880467b608 with: - modules-ignore: examples_2.13 examples_2.12 + modules-ignore: examples_2.13 configs-ignore: test It scala-tool scala-doc-tool diff --git a/project/AkkaDisciplinePlugin.scala b/project/AkkaDisciplinePlugin.scala index 6911e3f14..a769f4082 100644 --- a/project/AkkaDisciplinePlugin.scala +++ b/project/AkkaDisciplinePlugin.scala @@ -37,9 +37,6 @@ object AkkaDisciplinePlugin extends AutoPlugin { "-Ywarn-nullary-unit", "-Ypartial-unification", "-Yno-adapted-args") - case Some((2, 12)) => - // no fatal-warnings for 2.12 - disciplineScalacOptions - "-Xfatal-warnings" case _ => Nil }).toSeq, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e290fa4ff..bb726a131 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,10 +6,9 @@ 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 AkkaVersionInDocs = "2.9"