Merge pull request #725 from mkurz/upgrade-sbt-java-formatter

Upgrade sbt-java-formatter

Author: mkurz

build.sbt

@@ -28,6 +28,8 @@ lazy val mimaSettings = Seq(
   )
 )
 
+ThisBuild / javafmtFormatterCompatibleJavaVersion := 17
+
 lazy val root = project
   .in(file("."))
   .aggregate(core, plugin)

docs/build.sbt

@@ -8,6 +8,8 @@ import sbtheader.LineCommentCreator
 
 SettingKey[Seq[File]]("migrationManualSources") := Nil
 
+ThisBuild / javafmtFormatterCompatibleJavaVersion := 17
+
 lazy val docs = project
   .in(file("."))
   .enablePlugins(PlayDocsPlugin, PlayEbean)

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-M5"))
 
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.12.0")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
 

play-ebean/src/main/java/play/db/ebean/EbeanDynamicEvolutions.java

@@ -125,7 +125,8 @@ 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"
+        + "-- To stop Ebean DDL generation, remove this comment (both lines) and start using"
+        + " Evolutions\r\n"
         + "\r\n"
         + "-- !Ups\r\n"
         + "\r\n"

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.12.0")