Use sbt-java-formatter to format Java source code (#985)

earldouglas · Oct 18, 2024 · 0f1b3b8 · 0f1b3b8
1 parent b4b9799
commit 0f1b3b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,4 +12,4 @@ jobs:
     - uses: actions/setup-java@v1
       with:
         java-version: 11
-    - run: sbt scalafmtCheckAll "scalafixAll --check" test scripted
+    - run: sbt javafmtCheckAll scalafmtCheckAll "scalafixAll --check" test scripted
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,3 +3,4 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
+addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
diff --git a/runner/src/main/java/com/earldouglas/WarRunner.java b/runner/src/main/java/com/earldouglas/WarRunner.java
@@ -12,11 +12,11 @@ public static void main(final String[] args) throws Exception {
 
     final WarConfiguration warConfiguration = WarConfiguration.load(args[0]);
 
-    final String[] webappRunnerArgs =
+    final String[] warRunnerArgs =
         new String[] {
           "--port", Integer.toString(warConfiguration.port), warConfiguration.warFile.getPath(),
         };
 
-    webapp.runner.launch.Main.main(webappRunnerArgs);
+    webapp.runner.launch.Main.main(warRunnerArgs);
   }
 }