Skip to content

Commit 2e558ef

Browse files
committed
scala: Upgrade versions
1 parent 9f15cce commit 2e558ef

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
scala: [2.12.12, 2.13.6]
24+
scala: [2.12.15, 2.13.6]
2525
java: ['1.8', '1.11']
2626
runs-on: ubuntu-latest
2727
steps:

build.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,18 @@ def jdk11GcJavaOptions: Seq[String] = {
8282
)
8383
}
8484

85+
// Upgrading to a later version requires also upgrading sbt-scoverage, Scalatest, and
86+
// some modules like util-mock and util-test.
8587
val _scalaVersion = "2.13.6"
86-
val _crossScalaVersions = Seq("2.12.12", "2.13.6")
88+
val _crossScalaVersions = Seq("2.12.15", "2.13.6")
8789

8890
val defaultScalaSettings = Seq(
8991
scalaVersion := _scalaVersion,
9092
crossScalaVersions := _crossScalaVersions
9193
)
9294
val defaultScala3EnabledSettings = Seq(
9395
scalaVersion := _scalaVersion,
94-
crossScalaVersions := _crossScalaVersions ++ Seq("3.0.2-RC1")
96+
crossScalaVersions := _crossScalaVersions ++ Seq("3.1.3")
9597
)
9698

9799
// Our dependencies or compiler options may differ for both Scala 2 and 3. We branch here

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ resolvers += Classpaths.sbtPluginReleases
22
resolvers += Resolver.sonatypeRepo("snapshots")
33

44
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
5-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.1")
5+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
66
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
77
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")

0 commit comments

Comments
 (0)