From d415211bf85be991c9560c8cbf34fc47493cd412 Mon Sep 17 00:00:00 2001 From: Domantas Petrauskas Date: Fri, 24 Apr 2020 15:12:01 +0300 Subject: [PATCH] Update sbt-java-formatter to 0.5.1, disable javafmt on compile if discipline is disabled (#28962) --- project/JavaFormatter.scala | 11 +++++++---- project/plugins.sbt | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/project/JavaFormatter.scala b/project/JavaFormatter.scala index 55ea7dedbd..bc7825ae2d 100644 --- a/project/JavaFormatter.scala +++ b/project/JavaFormatter.scala @@ -4,7 +4,7 @@ import akka.ProjectFileIgnoreSupport import com.lightbend.sbt.JavaFormatterPlugin -import sbt.{AutoPlugin, PluginTrigger, Plugins} +import sbt.{ AutoPlugin, PluginTrigger, Plugins } object JavaFormatter extends AutoPlugin { @@ -15,6 +15,8 @@ object JavaFormatter extends AutoPlugin { private val ignoreConfigFileName: String = ".sbt-java-formatter.conf" private val descriptor: String = "sbt-java-formatter" + private val formatOnCompile = !sys.props.contains("akka.no.discipline") + import JavaFormatterPlugin.autoImport._ import sbt.Keys._ import sbt._ @@ -23,9 +25,10 @@ object JavaFormatter extends AutoPlugin { override def projectSettings: Seq[Def.Setting[_]] = Seq( //below is for sbt java formatter (excludeFilter in javafmt) := { - val ignoreSupport = new ProjectFileIgnoreSupport((baseDirectory in ThisBuild).value / ignoreConfigFileName, descriptor) + val ignoreSupport = + new ProjectFileIgnoreSupport((baseDirectory in ThisBuild).value / ignoreConfigFileName, descriptor) val simpleFileFilter = new SimpleFileFilter(file => ignoreSupport.isIgnoredByFileOrPackages(file)) simpleFileFilter || (excludeFilter in javafmt).value - } - ) + }, + javafmtOnCompile := formatOnCompile) } diff --git a/project/plugins.sbt b/project/plugins.sbt index c14aa1173b..e4338a43d3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ libraryDependencies += Defaults.sbtPluginExtra( addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0") //#sbt-multi-jvm -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.5.0") +addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.5.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.6") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.14") // sbt-osgi 0.9.5 is available but breaks including jdk9-only classes