diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index bfd9bc63..52844c6f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -5,3 +5,6 @@ # Scala Steward: Reformat with scalafmt 3.9.7 7e13a34bed0d9894cd09646d844f106ca8fa6d57 + +# Scala Steward: Reformat with sbt-java-formatter 0.11.0 +65125f3aa151e3b70b49b22cd75c583641ab2369 diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index 5d15ac17..babf32a6 100644 --- a/docs/project/plugins.sbt +++ b/docs/project/plugins.sbt @@ -8,7 +8,7 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true) addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.10")) -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.11.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") diff --git a/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java b/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java index dcb47ccb..120b1aac 100644 --- a/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java +++ b/play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java @@ -125,10 +125,11 @@ private static String generateScript(SpiEbeanServer spiServer) { } return "-- Created by Ebean DDL\r\n" - + "-- To stop Ebean DDL generation, remove this comment (both lines) and start using Evolutions\r\n" - + "\r\n" - + "-- !Ups\r\n" - + "\r\n" + + "-- To stop Ebean DDL generation, remove this comment (both lines) and start using" + + " Evolutions\r\n" + + "\r\n" + + "-- !Ups\r\n" + + "\r\n" + ups + "\r\n" + "-- !Downs\r\n" diff --git a/project/plugins.sbt b/project/plugins.sbt index 2f016c39..22ab7d57 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2") -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.11.0")