From 7df86581c7c6f76f44fd9ac4dd437f809e392a7e Mon Sep 17 00:00:00 2001
From: Felix Bruckmeier <felix.bruckmeier@gutefrage.net>
Date: Thu, 30 Jun 2022 21:15:00 +0200
Subject: [PATCH] scala: Upgrade versions

---
 .github/workflows/continuous-integration.yml | 2 +-
 build.sbt                                    | 5 +++--
 project/plugins.sbt                          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 8a50a1be8a..5cd0deb207 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scala: [2.12.12, 2.13.6]
+        scala: [2.12.16, 2.13.6]
         java: ['1.8', '1.11']
     runs-on: ubuntu-latest
     steps:
diff --git a/build.sbt b/build.sbt
index 04845a7d99..cff93a2741 100644
--- a/build.sbt
+++ b/build.sbt
@@ -82,8 +82,9 @@ def jdk11GcJavaOptions: Seq[String] = {
   )
 }
 
+// Upgrading to a later version requires also upgrading Scalatest and some modules like util-mock and util-test
 val _scalaVersion = "2.13.6"
-val _crossScalaVersions = Seq("2.12.12", "2.13.6")
+val _crossScalaVersions = Seq("2.12.16", "2.13.6")
 
 val defaultScalaSettings = Seq(
   scalaVersion := _scalaVersion,
@@ -91,7 +92,7 @@ val defaultScalaSettings = Seq(
 )
 val defaultScala3EnabledSettings = Seq(
   scalaVersion := _scalaVersion,
-  crossScalaVersions := _crossScalaVersions ++ Seq("3.0.2-RC1")
+  crossScalaVersions := _crossScalaVersions ++ Seq("3.1.3")
 )
 
 // Our dependencies or compiler options may differ for both Scala 2 and 3. We branch here
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d959da10ca..e0b1f3d12b 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,6 +2,6 @@ resolvers += Classpaths.sbtPluginReleases
 resolvers += Resolver.sonatypeRepo("snapshots")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.0")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")