Merge pull request #754 from scala-steward/update/1.6.x/patches

[1.6.x] Patch updates
playframework · Apr 25, 2024 · 42e13db · 42e13db
2 parents bd9a99f + 90f6e09
commit 42e13db
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -113,7 +113,7 @@ lazy val compiler = project
       }
     },
     libraryDependencies += parserCombinators(scalaVersion.value),
-    libraryDependencies += ("org.scalameta" %% "parsers" % "4.9.0").cross(CrossVersion.for3Use2_13),
+    libraryDependencies += ("org.scalameta" %% "parsers" % "4.9.2").cross(CrossVersion.for3Use2_13),
     run / fork                              := true,
     buildInfoKeys                           := Seq[BuildInfoKey](scalaVersion),
     buildInfoPackage                        := "play.twirl.compiler"

diff --git a/docs/build.sbt b/docs/build.sbt
@@ -10,7 +10,7 @@ lazy val docs = project
   .enablePlugins(PlayDocsPlugin)
   .configs(Configuration.of("Docs", "docs"))
   .settings(
-    scalaVersion := "2.13.12",
+    scalaVersion := "2.13.13",
     // use special snapshot play version for now
     resolvers ++= DefaultOptions.resolvers(snapshot = true),
     resolvers += Resolver.typesafeRepo("releases"),

diff --git a/docs/project/build.properties b/docs/project/build.properties
@@ -1,3 +1,3 @@
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-sbt.version=1.9.8
+sbt.version=1.9.9
diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt
@@ -6,6 +6,6 @@ lazy val sbtTwirl = ProjectRef(Path.fileProperty("user.dir").getParentFile, "plu
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 
-addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.1"))
+addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.2"))
 addSbtPlugin("de.heikoseeberger" % "sbt-header"           % "5.10.0")
 addSbtPlugin("org.scalameta"     % "sbt-scalafmt"         % "2.5.2")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -3,8 +3,8 @@
  */
 
 object Dependencies {
-  val Scala212      = "2.12.18"
-  val Scala213      = "2.13.12"
-  val Scala3        = "3.3.1"
+  val Scala212      = "2.12.19"
+  val Scala213      = "2.13.13"
+  val Scala3        = "3.3.3"
   val ScalaVersions = Seq(Scala212, Scala213, Scala3)
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1,3 +1,3 @@
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-sbt.version=1.9.8
+sbt.version=1.9.9
diff --git a/sbt-twirl/src/sbt-test/twirl/compile-scala3/build.sbt b/sbt-twirl/src/sbt-test/twirl/compile-scala3/build.sbt
@@ -13,6 +13,6 @@ lazy val root = (project in file("."))
     SbtTwirl
   }
   .settings(
-    scalaVersion := "3.3.1",
+    scalaVersion := "3.3.3",
     scalacOptions ++= Seq("-source:future", "-feature")
   )