raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Update sbt-java-formatter to 0.5.1, disable javafmt on compile if discipline is disabled (#28962)

Browse source
This commit is contained in:
Domantas Petrauskas 2020-04-24 15:12:01 +03:00 • committed by GitHub
parent 305fa61a64
commit d415211bf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
project/JavaFormatter.scala
View file

@ -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)
}

2
project/plugins.sbt
View file

@ -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