Merge pull request #346 from playframework/mergify/bp/9.0.x/pr-345

[9.0.x] Upgrade sbt + Scala (backport #345) by @mkurz
playframework · Oct 8, 2024 · 0b213ea · 0b213ea
2 parents 3377093 + d2e076a
commit 0b213ea
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,8 +2,8 @@ import sbt._
 
 object Dependencies {
   // scalaVersion needs to be kept in sync with ci
-  val Scala213 = "2.13.14"
-  val Scala3 = "3.3.3"
+  val Scala213 = "2.13.15"
+  val Scala3 = "3.3.4"
   val ScalaVersions = Seq(Scala213, Scala3)
 
   val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.5"))

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.2
diff --git a/samples/compile-timeDI/build.sbt b/samples/compile-timeDI/build.sbt
@@ -7,9 +7,9 @@ ThisBuild / dynverVTagPrefix := false
 
 ThisBuild / dynverSonatypeSnapshots := true
 
-scalaVersion := "2.13.14"
+scalaVersion := "2.13.15"
 
-crossScalaVersions := Seq("2.13.14", "3.3.3")
+crossScalaVersions := Seq("2.13.15", "3.3.4")
 
 libraryDependencies ++= Seq(
   "com.typesafe.play" %% "play-mailer" % version.value,

diff --git a/samples/compile-timeDI/project/build.properties b/samples/compile-timeDI/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.2
diff --git a/samples/runtimeDI/build.sbt b/samples/runtimeDI/build.sbt
@@ -7,9 +7,9 @@ ThisBuild / dynverVTagPrefix := false
 
 ThisBuild / dynverSonatypeSnapshots := true
 
-scalaVersion := "2.13.14"
+scalaVersion := "2.13.15"
 
-crossScalaVersions := Seq("2.13.14", "3.3.3")
+crossScalaVersions := Seq("2.13.15", "3.3.4")
 
 libraryDependencies ++= Seq(
   "com.typesafe.play" %% "play-mailer-guice" % version.value,

diff --git a/samples/runtimeDI/project/build.properties b/samples/runtimeDI/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.2