diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..393ef18 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.9.8 +c607e1e9bd721f01470c717fabc76607c3108aef diff --git a/.scalafmt.conf b/.scalafmt.conf index c8194bb..e9db51a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.4 +version = 3.9.8 style = defaultWithAlign diff --git a/plugin/src/sbt-test/sbt-java-formatter/aosp-style/project/plugins.sbt b/plugin/src/sbt-test/sbt-java-formatter/aosp-style/project/plugins.sbt index 7ef9c15..6e37f4a 100644 --- a/plugin/src/sbt-test/sbt-java-formatter/aosp-style/project/plugins.sbt +++ b/plugin/src/sbt-test/sbt-java-formatter/aosp-style/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version")) +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version")) diff --git a/plugin/src/sbt-test/sbt-java-formatter/default/project/plugins.sbt b/plugin/src/sbt-test/sbt-java-formatter/default/project/plugins.sbt index 7ef9c15..6e37f4a 100644 --- a/plugin/src/sbt-test/sbt-java-formatter/default/project/plugins.sbt +++ b/plugin/src/sbt-test/sbt-java-formatter/default/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version")) +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version")) diff --git a/plugin/src/sbt-test/sbt-java-formatter/multi-module-crawl-up-for-file/build.sbt b/plugin/src/sbt-test/sbt-java-formatter/multi-module-crawl-up-for-file/build.sbt index 8519820..b705fe8 100644 --- a/plugin/src/sbt-test/sbt-java-formatter/multi-module-crawl-up-for-file/build.sbt +++ b/plugin/src/sbt-test/sbt-java-formatter/multi-module-crawl-up-for-file/build.sbt @@ -1,12 +1,9 @@ lazy val sbtJavaFormatter = project .in(file(".")) .aggregate(inner) - .settings( - TaskKey[Unit]("removeFile") := { - val actualPath = (inner / Compile / javaSource).value / "com" / "lightbend" / "GoodFormatting.java" - java.nio.file.Files.delete(actualPath.toPath) - } - ) + .settings(TaskKey[Unit]("removeFile") := { + val actualPath = (inner / Compile / javaSource).value / "com" / "lightbend" / "GoodFormatting.java" + java.nio.file.Files.delete(actualPath.toPath) + }) -lazy val inner = project - .in(file("inner")) +lazy val inner = project.in(file("inner")) diff --git a/plugin/src/sbt-test/sbt-java-formatter/multi-module-crawl-up-for-file/project/plugins.sbt b/plugin/src/sbt-test/sbt-java-formatter/multi-module-crawl-up-for-file/project/plugins.sbt index 7ef9c15..6e37f4a 100644 --- a/plugin/src/sbt-test/sbt-java-formatter/multi-module-crawl-up-for-file/project/plugins.sbt +++ b/plugin/src/sbt-test/sbt-java-formatter/multi-module-crawl-up-for-file/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version")) +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version")) diff --git a/plugin/src/sbt-test/sbt-java-formatter/on-compile-false/project/plugins.sbt b/plugin/src/sbt-test/sbt-java-formatter/on-compile-false/project/plugins.sbt index 7ef9c15..6e37f4a 100644 --- a/plugin/src/sbt-test/sbt-java-formatter/on-compile-false/project/plugins.sbt +++ b/plugin/src/sbt-test/sbt-java-formatter/on-compile-false/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version")) +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version")) diff --git a/plugin/src/sbt-test/sbt-java-formatter/on-compile-true/project/plugins.sbt b/plugin/src/sbt-test/sbt-java-formatter/on-compile-true/project/plugins.sbt index 7ef9c15..6e37f4a 100644 --- a/plugin/src/sbt-test/sbt-java-formatter/on-compile-true/project/plugins.sbt +++ b/plugin/src/sbt-test/sbt-java-formatter/on-compile-true/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version")) +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % System.getProperty("plugin.version"))