Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sbt-java-formatter to 0.8.0 #593

Merged
merged 3 commits into from
Nov 18, 2022
Merged

Update sbt-java-formatter to 0.8.0 #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf65ec4
Update sbt-java-formatter to 0.8.0
scalameta-bot Oct 21, 2022
9e5e761
Reformat with sbt-java-formatter 0.8.0
scalameta-bot Oct 21, 2022
36876bb
Add 'Reformat with sbt-java-formatter 0.8.0' to .git-blame-ignore-revs
scalameta-bot Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with sbt-java-formatter 0.8.0
9e5e7610a81938d804d8edf533844b03ef125b5a
4 changes: 2 additions & 2 deletions junit-interface/src/main/java/munit/internal/junitinterface/AbstractEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion junit-interface/src/main/java/munit/internal/junitinterface/CustomRunners.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;

import sbt.testing.Fingerprint;
import sbt.testing.SubclassFingerprint;

Expand Down
5 changes: 2 additions & 3 deletions junit-interface/src/main/java/munit/internal/junitinterface/EventDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 =
Expand Down
1 change: 0 additions & 1 deletion junit-interface/src/main/java/munit/internal/junitinterface/GlobFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.ArrayList;
import java.util.regex.Pattern;

import org.junit.runner.Description;
import org.junit.runner.manipulation.Filter;

Expand Down
5 changes: 0 additions & 5 deletions junit-interface/src/main/java/munit/internal/junitinterface/JUnitComputer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 0 additions & 2 deletions junit-interface/src/main/java/munit/internal/junitinterface/JUnitFramework.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package munit.internal.junitinterface;

import java.util.Arrays;

import sbt.testing.Fingerprint;
import sbt.testing.Framework;

Expand Down
11 changes: 4 additions & 7 deletions junit-interface/src/main/java/munit/internal/junitinterface/JUnitRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions junit-interface/src/main/java/munit/internal/junitinterface/JUnitTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions junit-interface/src/main/java/munit/internal/junitinterface/PantsFramework.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions junit-interface/src/main/java/munit/internal/junitinterface/RichLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 0 additions & 2 deletions junit-interface/src/main/java/munit/internal/junitinterface/RunSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions junit-interface/src/main/java/munit/internal/junitinterface/RunStatistics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
5 changes: 2 additions & 3 deletions junit-interface/src/main/java/munit/internal/junitinterface/TagFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion junit-interface/src/main/java/munit/internal/junitinterface/TestFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import java.util.HashSet;
import java.util.regex.Pattern;

import org.junit.runner.Description;
import org.junit.runner.manipulation.Filter;

Expand Down
2 changes: 1 addition & 1 deletion munit/jvm/src/main/java/munit/IgnoreSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {}
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.0"