From 5adb0b4a0413563410911c2dd2b2ab94d456664e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 23 Oct 2022 20:16:31 +0000 Subject: [PATCH 1/3] scalafmt-core 3.6.0 (was 3.5.9) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7a4badfc..f3e16829 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.5.9 +version = 3.6.0 runner.dialect = scala213 From c846f08f0eba509d8f0f39114578cbe61465106d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 23 Oct 2022 20:16:49 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.6.0 Executed command: scalafmt --non-interactive --- docs/project/plugins.sbt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index 930faafa..87f0bd46 100644 --- a/docs/project/plugins.sbt +++ b/docs/project/plugins.sbt @@ -1,7 +1,9 @@ -lazy val plugins = (project in file(".")).dependsOn(sbtTwirl).settings( - excludeDependencies += "com.typesafe.sbt" % "sbt-native-packager", // TODO: remove when Play switched to com.github.sbt - scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021 -) +lazy val plugins = (project in file(".")) + .dependsOn(sbtTwirl) + .settings( + excludeDependencies += "com.typesafe.sbt" % "sbt-native-packager", // TODO: remove when Play switched to com.github.sbt + scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021 + ) lazy val sbtTwirl = ProjectRef(Path.fileProperty("user.dir").getParentFile, "plugin") From 0b74f2a1ff7fd750685b01fedd3bd6b648e9b881 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 23 Oct 2022 20:16:49 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.6.0' 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 1897f979..5680b6b3 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.5.8 3f6f5c9d187ed87c23c5321799dbce756a840a11 + +# Scala Steward: Reformat with scalafmt 3.6.0 +c846f08f0eba509d8f0f39114578cbe61465106d