Merge pull request #394 from scala-steward/update/9.1.x/patches

mkurz · web-flow · commit 2f59f5caddc5 · 2025-03-21T22:12:45.000+01:00
[9.1.x] Patch updates
diff --git a/build.sbt b/build.sbt
@@ -44,7 +44,7 @@ lazy val `play-mailer` = (project in file("play-mailer"))
     libraryDependencies ++= Seq(
       "javax.inject" % "javax.inject" % "1",
       "com.typesafe" % "config" % "1.4.3",
-      "org.slf4j" % "slf4j-api" % "2.0.16",
+      "org.slf4j" % "slf4j-api" % "2.0.17",
       "org.apache.commons" % "commons-email" % "1.6.0",
       "com.typesafe.play" %% "play" % Dependencies.PlayVersion % Test,
       "com.typesafe.play" %% "play-specs2" % Dependencies.PlayVersion % Test
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,5 +6,5 @@ object Dependencies {
   val Scala3 = "3.3.5"
   val ScalaVersions = Seq(Scala213, Scala3)
 
-  val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.6"))
+  val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.7"))
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.10.11
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
 addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3")
diff --git a/samples/compile-timeDI/project/build.properties b/samples/compile-timeDI/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.10.11
diff --git a/samples/compile-timeDI/project/plugins.sbt b/samples/compile-timeDI/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.6"))
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.7"))
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")
diff --git a/samples/runtimeDI/project/build.properties b/samples/runtimeDI/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.10.11
diff --git a/samples/runtimeDI/project/plugins.sbt b/samples/runtimeDI/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.6"))
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.7"))
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ object Dependencies {`
`6`	`6`	`val Scala3 = "3.3.5"`
`7`	`7`	`val ScalaVersions = Seq(Scala213, Scala3)`
`8`	`8`
`9`		`- val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.6"))`
	`9`	`+ val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.7"))`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=1.10.7`
	`1`	`+sbt.version=1.10.11`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.6"))`
	`1`	`+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.7"))`
`2`	`2`	`addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")`