Skip to content

Commit

Permalink
Merge pull request #322 from scala-steward/update/patches
Browse files Browse the repository at this point in the history
Patch updates
  • Loading branch information
mkurz authored Apr 28, 2024
2 parents 2c6e66f + b11975f commit 1fca902
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import sbt._

object Dependencies {
// scalaVersion needs to be kept in sync with ci
val Scala213 = "2.13.12"
val Scala3 = "3.3.1"
val Scala213 = "2.13.13"
val Scala3 = "3.3.3"
val ScalaVersions = Seq(Scala213, Scala3)

val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "3.0.1"))
val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "3.0.2"))
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.9.9
4 changes: 2 additions & 2 deletions samples/compile-timeDI/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ ThisBuild / dynverVTagPrefix := false

ThisBuild / dynverSonatypeSnapshots := true

scalaVersion := "2.13.12"
scalaVersion := "2.13.13"

crossScalaVersions := Seq("2.13.12", "3.3.1")
crossScalaVersions := Seq("2.13.13", "3.3.3")

libraryDependencies ++= Seq(
"org.playframework" %% "play-mailer" % version.value,
Expand Down
2 changes: 1 addition & 1 deletion samples/compile-timeDI/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion samples/compile-timeDI/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.playframework" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "3.0.1"))
addSbtPlugin("org.playframework" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "3.0.2"))
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
4 changes: 2 additions & 2 deletions samples/runtimeDI/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ ThisBuild / dynverVTagPrefix := false

ThisBuild / dynverSonatypeSnapshots := true

scalaVersion := "2.13.12"
scalaVersion := "2.13.13"

crossScalaVersions := Seq("2.13.12", "3.3.1")
crossScalaVersions := Seq("2.13.13", "3.3.3")

libraryDependencies ++= Seq(
"org.playframework" %% "play-mailer-guice" % version.value,
Expand Down
2 changes: 1 addition & 1 deletion samples/runtimeDI/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion samples/runtimeDI/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.playframework" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "3.0.1"))
addSbtPlugin("org.playframework" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "3.0.2"))
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")

0 comments on commit 1fca902

Please sign in to comment.