From df721163c278c6d04d0139dd372ccfaf63b66006 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Apr 2024 12:00:32 +0200 Subject: [PATCH 1/6] sbt-bloop 1.5.17 (was 1.5.15) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ed70e1db..86140919 100644 --- 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") From b8353dc98f2df8aa954cb9d421a54e5498d5dcd0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Apr 2024 12:00:35 +0200 Subject: [PATCH 2/6] plexus-utils 4.0.1 (was 4.0.0) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d1398462..cf05a429 100644 --- a/build.sbt +++ b/build.sbt @@ -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, ) From 179ab9193eda459b7b08080877578514d04e037e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Apr 2024 12:00:38 +0200 Subject: [PATCH 3/6] parsers 4.9.3 (was 4.9.2) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index cf05a429..8c0363ec 100644 --- 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", From 7d0670feca18fb8ff3966292b30cd95efbcf5553 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Apr 2024 12:00:40 +0200 Subject: [PATCH 4/6] scalafmt-core 3.8.1 (was 3.8.0) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 8bcc6301..0cb977ce 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.0 +version = 3.8.1 runner.dialect = scala213 From cb6d4261c6253f685d50b24177064616e5d22143 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Apr 2024 12:00:44 +0200 Subject: [PATCH 5/6] Reformat with scalafmt 3.8.1 Executed command: scalafmt --non-interactive --- .../src/test/scala/test/Test.scala | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) 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 index b301587b..78defffb 100644 --- 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" ) } From f9190736781b02203a1654282ae18f54de4e9147 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Apr 2024 12:00:44 +0200 Subject: [PATCH 6/6] Add 'Reformat with scalafmt 3.8.1' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 27cdb029..b421b877 100644 --- 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