From 42d73c44eccfa6465a9d4d0ce713dffdf5096fd7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 6 Jul 2025 11:25:37 +0000 Subject: [PATCH 1/3] sbt-java-formatter 0.10.0 (was 0.8.0) --- docs/project/plugins.sbt | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index e04dc63e..fd92ba94 100644 --- a/docs/project/plugins.sbt +++ b/docs/project/plugins.sbt @@ -8,7 +8,7 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true) addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.1.0-M2")) -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") diff --git a/project/plugins.sbt b/project/plugins.sbt index bf8d10ad..7a4b572a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1") -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") From d373a190e25707e41479158f6281918a81509f7e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 6 Jul 2025 11:27:07 +0000 Subject: [PATCH 2/3] Reformat with sbt-java-formatter 0.10.0 Executed command: sbt javafmtAll --- .../main/java/play/db/ebean/EbeanDynamicEvolutions.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 62d3840b..edeab550 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" From 9466f9213f69bb30cf5e97130761437dab1de170 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 6 Jul 2025 11:27:08 +0000 Subject: [PATCH 3/3] Add 'Reformat with sbt-java-formatter 0.10.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 788efdf1..f8066096 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -5,3 +5,6 @@ # Scala Steward: Reformat with scalafmt 3.9.8 aa32f0df6ba6661a2f8620c10a15c66dddc23354 + +# Scala Steward: Reformat with sbt-java-formatter 0.10.0 +d373a190e25707e41479158f6281918a81509f7e