Skip to content

Commit 14dd374

Browse files
authored
Merge pull request #315 from cucumber/bump-libs
Bump Scala and sbt version
2 parents c54cf46 + 08f60ff commit 14dd374

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
1313

1414
### Changed
1515

16+
- [Scala] Upgrade Scala version to 2.12.16, 2.13.8 and 3.1.3
17+
- [sbt] Upgrade sbt to 1.7.1
18+
1619
### Deprecated
1720

1821
### Removed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ ThisBuild / homepage := Some(
3030

3131
// Scala versions
3232

33-
val scala212 = "2.12.15"
34-
val scala213 = "2.13.6"
35-
val scala3 = "3.0.2"
33+
val scala212 = "2.12.16"
34+
val scala213 = "2.13.8"
35+
val scala3 = "3.1.3"
3636

3737
scalaVersion := scala213
3838

@@ -51,7 +51,7 @@ lazy val commonSettings = Seq(
5151
CrossVersion.partialVersion(scalaVersion.value) match {
5252
case Some((2, 12)) => ScalacOptions.scalacOptions212
5353
case Some((2, 13)) => ScalacOptions.scalacOptions213
54-
case Some((3, 0)) => ScalacOptions.scalacOptions3
54+
case Some((3, _)) => ScalacOptions.scalacOptions3
5555
case _ => Seq()
5656
}
5757
}

project/ScalacOptions.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
object ScalacOptions {
22

33
val scalacOptions3 = Seq(
4-
"-source:3.0",
54
"-deprecation", // Emit warning and location for usages of deprecated APIs.
65
"-explain", // Explain type errors in more detail.
76
// "-explaintypes", // Explain type errors in more detail.

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.6.2
1+
sbt.version=1.7.1

0 commit comments

Comments
 (0)