Skip to content

Commit

Permalink
Rename the main key to javafmt
Browse files Browse the repository at this point in the history
Make the runtime name match the compile-time name.
  • Loading branch information
dwijnand committed Feb 15, 2019
1 parent f1b2265 commit 5a4d8a8
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions plugin/src/main/scala/com/lightbend/sbt/JavaFormatterPlugin.scala
Expand Up @@ -30,15 +30,16 @@ object AutomateJavaFormatterPlugin extends AutoPlugin {
override def projectSettings = automateFor(Compile, Test)

def automateFor(configurations: Configuration*): Seq[Setting[_]] = configurations.foldLeft(List.empty[Setting[_]]) {
_ ++ inConfig(_)(compile := compile.dependsOn(JavaFormatterPlugin.JavaFormatterKeys.format).value)
_ ++ inConfig(_)(compile := compile.dependsOn(JavaFormatterPlugin.JavaFormatterKeys.javafmt).value)
}
}

object JavaFormatterPlugin extends AutoPlugin {

object JavaFormatterKeys {
val format: TaskKey[Seq[File]] =
TaskKey("javafmt", "Format Java sources")
val javafmt: TaskKey[Seq[File]] = taskKey("Format Java sources")
@deprecated("Use javafmt", "0.4.4")
val format: TaskKey[Seq[File]] = javafmt
}

val autoImport = JavaFormatterKeys
Expand All @@ -63,13 +64,13 @@ object JavaFormatterPlugin extends AutoPlugin {

def toBeScopedSettings: Seq[Setting[_]] =
List(
(sourceDirectories in format) := List(javaSource.value),
format := {
(sourceDirectories in javafmt) := List(javaSource.value),
javafmt := {
val streamz = streams.value
val log = streamz.log
val sD = (sourceDirectories in format).value.toList
val iF = (includeFilter in format).value
val eF = (excludeFilter in format).value
val sD = (sourceDirectories in javafmt).value.toList
val iF = (includeFilter in javafmt).value
val eF = (excludeFilter in javafmt).value
val tPR = thisProjectRef.value
val c = configuration.value
JavaFormatter(
Expand All @@ -83,6 +84,6 @@ object JavaFormatterPlugin extends AutoPlugin {

def notToBeScopedSettings: Seq[Setting[_]] =
List(
includeFilter in format := "*.java")
includeFilter in javafmt := "*.java")

}

0 comments on commit 5a4d8a8

Please sign in to comment.