scala: Upgrade versions

twitter · Jun 30, 2022 · 7df8658 · 7df8658
1 parent 9f15cce
commit 7df8658
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -82,16 +82,17 @@ 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,
  crossScalaVersions := _crossScalaVersions
 )
 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
@@ -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")