Merge pull request #593 from scalameta/update/sbt-java-formatter-0.8.0

Update sbt-java-formatter to 0.8.0
scalameta · Nov 18, 2022 · f7511b3 · f7511b3
2 parents 371ec5a + 36876bb
commit f7511b3
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 39 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with sbt-java-formatter 0.8.0
+9e5e7610a81938d804d8edf533844b03ef125b5a
diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/AbstractEvent.java b/junit-interface/src/main/java/munit/internal/junitinterface/AbstractEvent.java
@@ -1,9 +1,9 @@
 package munit.internal.junitinterface;
 
-import sbt.testing.*;
-
 import static munit.internal.junitinterface.Ansi.*;
 
+import sbt.testing.*;
+
 abstract class AbstractEvent implements Event {
   protected final String ansiName;
   protected final String ansiMsg;

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/CustomRunners.java b/junit-interface/src/main/java/munit/internal/junitinterface/CustomRunners.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import sbt.testing.Fingerprint;
 import sbt.testing.SubclassFingerprint;
 

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/EventDispatcher.java b/junit-interface/src/main/java/munit/internal/junitinterface/EventDispatcher.java
@@ -1,11 +1,12 @@
 package munit.internal.junitinterface;
 
+import static munit.internal.junitinterface.Ansi.*;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.junit.runner.Description;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
@@ -14,8 +15,6 @@
 import sbt.testing.Fingerprint;
 import sbt.testing.Status;
 
-import static munit.internal.junitinterface.Ansi.*;
-
 final class EventDispatcher extends RunListener {
   private final RichLogger logger;
   private final Set<Description> reported =

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/GlobFilter.java b/junit-interface/src/main/java/munit/internal/junitinterface/GlobFilter.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.regex.Pattern;
-
 import org.junit.runner.Description;
 import org.junit.runner.manipulation.Filter;
 

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/JUnitComputer.java b/junit-interface/src/main/java/munit/internal/junitinterface/JUnitComputer.java
@@ -1,13 +1,8 @@
 package munit.internal.junitinterface;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
-
 import org.junit.runner.Computer;
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/JUnitFramework.java b/junit-interface/src/main/java/munit/internal/junitinterface/JUnitFramework.java
@@ -1,7 +1,5 @@
 package munit.internal.junitinterface;
 
-import java.util.Arrays;
-
 import sbt.testing.Fingerprint;
 import sbt.testing.Framework;
 

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/JUnitRunner.java b/junit-interface/src/main/java/munit/internal/junitinterface/JUnitRunner.java
@@ -6,17 +6,14 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.junit.runner.notification.RunListener;
-
 import sbt.testing.Runner;
-import sbt.testing.Task;
 import sbt.testing.Selector;
-import sbt.testing.TestSelector;
+import sbt.testing.Task;
 import sbt.testing.TaskDef;
-
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import sbt.testing.TestSelector;
 
 final class JUnitRunner implements Runner {
   private final String[] args;

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/JUnitTask.java b/junit-interface/src/main/java/munit/internal/junitinterface/JUnitTask.java
@@ -4,14 +4,12 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
+import junit.framework.TestCase;
 import org.junit.experimental.categories.Categories;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
 import org.junit.runner.RunWith;
-
-import junit.framework.TestCase;
 import sbt.testing.EventHandler;
 import sbt.testing.Fingerprint;
 import sbt.testing.Logger;

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/PantsFramework.java b/junit-interface/src/main/java/munit/internal/junitinterface/PantsFramework.java
@@ -1,8 +1,5 @@
 package munit.internal.junitinterface;
 
-import java.io.OutputStream;
-import java.io.PrintStream;
-
 import sbt.testing.Fingerprint;
 
 public class PantsFramework extends JUnitFramework {

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/RichLogger.java b/junit-interface/src/main/java/munit/internal/junitinterface/RichLogger.java
@@ -1,12 +1,12 @@
 package munit.internal.junitinterface;
 
+import static munit.internal.junitinterface.Ansi.*;
+
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedDeque;
-
 import sbt.testing.Logger;
-import static munit.internal.junitinterface.Ansi.*;
 
 final class RichLogger {
   private final Logger[] loggers;

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/RunSettings.java b/junit-interface/src/main/java/munit/internal/junitinterface/RunSettings.java
@@ -16,9 +16,7 @@
 
 import java.lang.reflect.Method;
 import java.util.*;
-
 import org.junit.runner.Description;
-
 import sbt.testing.Status;
 
 class RunSettings implements Settings {

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/RunStatistics.java b/junit-interface/src/main/java/munit/internal/junitinterface/RunStatistics.java
@@ -1,9 +1,8 @@
 package munit.internal.junitinterface;
 
-import sbt.testing.Status;
-
 import java.util.ArrayList;
 import java.util.List;
+import sbt.testing.Status;
 
 class RunStatistics {
   private final RunSettings settings;

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/TagFilter.java b/junit-interface/src/main/java/munit/internal/junitinterface/TagFilter.java
@@ -1,10 +1,9 @@
 package munit.internal.junitinterface;
 
-import org.junit.runner.Description;
-import org.junit.runner.manipulation.Filter;
-
 import java.lang.annotation.Annotation;
 import java.util.Set;
+import org.junit.runner.Description;
+import org.junit.runner.manipulation.Filter;
 
 public class TagFilter extends Filter {
   final Set<String> includeTags, excludeTags;

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/TestFilter.java b/junit-interface/src/main/java/munit/internal/junitinterface/TestFilter.java
@@ -4,7 +4,6 @@
 
 import java.util.HashSet;
 import java.util.regex.Pattern;
-
 import org.junit.runner.Description;
 import org.junit.runner.manipulation.Filter;
 

diff --git a/munit/jvm/src/main/java/munit/IgnoreSuite.java b/munit/jvm/src/main/java/munit/IgnoreSuite.java
@@ -1,7 +1,7 @@
 package munit;
 
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface IgnoreSuite {}
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -15,6 +15,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5")
 
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1")
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
+addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
 
 libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.15.0"