Skip to content

Commit 0b213ea

Browse files
authored
Merge pull request #346 from playframework/mergify/bp/9.0.x/pr-345
[9.0.x] Upgrade sbt + Scala (backport #345) by @mkurz
2 parents 3377093 + d2e076a commit 0b213ea

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

project/Dependencies.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import sbt._
22

33
object Dependencies {
44
// scalaVersion needs to be kept in sync with ci
5-
val Scala213 = "2.13.14"
6-
val Scala3 = "3.3.3"
5+
val Scala213 = "2.13.15"
6+
val Scala3 = "3.3.4"
77
val ScalaVersions = Seq(Scala213, Scala3)
88

99
val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.5"))

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.1
1+
sbt.version=1.10.2

samples/compile-timeDI/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ThisBuild / dynverVTagPrefix := false
77

88
ThisBuild / dynverSonatypeSnapshots := true
99

10-
scalaVersion := "2.13.14"
10+
scalaVersion := "2.13.15"
1111

12-
crossScalaVersions := Seq("2.13.14", "3.3.3")
12+
crossScalaVersions := Seq("2.13.15", "3.3.4")
1313

1414
libraryDependencies ++= Seq(
1515
"com.typesafe.play" %% "play-mailer" % version.value,
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.1
1+
sbt.version=1.10.2

samples/runtimeDI/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ThisBuild / dynverVTagPrefix := false
77

88
ThisBuild / dynverSonatypeSnapshots := true
99

10-
scalaVersion := "2.13.14"
10+
scalaVersion := "2.13.15"
1111

12-
crossScalaVersions := Seq("2.13.14", "3.3.3")
12+
crossScalaVersions := Seq("2.13.15", "3.3.4")
1313

1414
libraryDependencies ++= Seq(
1515
"com.typesafe.play" %% "play-mailer-guice" % version.value,
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.1
1+
sbt.version=1.10.2

0 commit comments

Comments
 (0)