Merge pull request #775 from mkurz/update/patches

Patch updates
playframework · Apr 30, 2024 · 5bee989 · 5bee989
2 parents fc6f19a + f919073
commit 5bee989
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -12,3 +12,6 @@ c846f08f0eba509d8f0f39114578cbe61465106d
 
 # Scala Steward: Reformat with scalafmt 3.7.5
 c3b04b90d9863ca2c7b7e56bc0bda148ce392642
+
+# Scala Steward: Reformat with scalafmt 3.8.1
+cb6d4261c6253f685d50b24177064616e5d22143
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.8.0
+version = 3.8.1
 
 runner.dialect = scala213
 

diff --git a/build.sbt b/build.sbt
@@ -116,7 +116,7 @@ lazy val compiler = project
       }
     },
     libraryDependencies += parserCombinators(scalaVersion.value),
-    libraryDependencies += ("org.scalameta" %% "parsers" % "4.9.2").cross(CrossVersion.for3Use2_13),
+    libraryDependencies += ("org.scalameta" %% "parsers" % "4.9.3").cross(CrossVersion.for3Use2_13),
     run / fork                              := true,
     buildInfoKeys                           := Seq[BuildInfoKey](scalaVersion),
     buildInfoPackage                        := "play.twirl.compiler",
@@ -177,7 +177,7 @@ lazy val mavenPlugin = project
       .dependsOn(parser / publishM2)
       .dependsOn(apiJvm / publishM2)
       .value,
-    libraryDependencies += "org.codehaus.plexus" % "plexus-utils" % "4.0.0",
+    libraryDependencies += "org.codehaus.plexus" % "plexus-utils" % "4.0.1",
     Compile / headerSources ++= (baseDirectory.value / "src" / "maven-test" ** ("*.java" || "*.scala" || "*.scala.html") --- (baseDirectory.value ** "target" ** "*")).get,
     mimaFailOnNoPrevious := false,
   )

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -10,6 +10,6 @@ addSbtPlugin("com.typesafe"      % "sbt-mima-plugin"    % "1.1.3")
 addSbtPlugin("de.heikoseeberger" % "sbt-header"         % "5.10.0")
 addSbtPlugin("org.scalameta"     % "sbt-scalafmt"       % "2.5.2")
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
-addSbtPlugin("ch.epfl.scala"     % "sbt-bloop"          % "1.5.15")
+addSbtPlugin("ch.epfl.scala"     % "sbt-bloop"          % "1.5.17")
 addSbtPlugin("com.eed3si9n"      % "sbt-buildinfo"      % "0.12.0")
 addSbtPlugin("com.github.sbt"    % "sbt-maven-plugin"   % "0.0.2")
diff --git a/sbt-twirl/src/sbt-test/twirl/compile-scala3/src/test/scala/test/Test.scala b/sbt-twirl/src/sbt-test/twirl/compile-scala3/src/test/scala/test/Test.scala
@@ -13,7 +13,33 @@ object Test extends App {
 
   test(
     html.manyargstemplate.render(
-      "1", "2", "3", "5", "4", "7", "6", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26"),
+      "1",
+      "2",
+      "3",
+      "5",
+      "4",
+      "7",
+      "6",
+      "8",
+      "9",
+      "10",
+      "11",
+      "12",
+      "13",
+      "14",
+      "15",
+      "16",
+      "17",
+      "18",
+      "19",
+      "20",
+      "21",
+      "22",
+      "23",
+      "24",
+      "25",
+      "26"
+    ),
     "26 args: 1 2 3 5 4 7 6 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26\n"
   )
 }