Skip to content

Update sbt-java-formatter to 0.8.0 #417

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update sbt-java-formatter to 0.8.0 #417

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
bb3338d
Update sbt-java-formatter to 0.8.0
scala-steward Nov 20, 2022
d056713
Reformat with sbt-java-formatter 0.8.0
scala-steward Nov 20, 2022
d4f4b53
Add 'Reformat with sbt-java-formatter 0.8.0' to .git-blame-ignore-revs
scala-steward Nov 20, 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
d056713ddbaedd7023b787ab9ba0633e598cccfe
2 changes: 0 additions & 2 deletions modules/core/src/main/java/org/dhallj/cbor/Visitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package org.dhallj.cbor;

import java.math.BigInteger;
import java.util.List;
import java.util.Map;

/**
* Represents a function from a CBOR expression to a value.
Expand Down
4 changes: 0 additions & 4 deletions modules/core/src/main/java/org/dhallj/cbor/Writer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayDeque;
import java.util.Deque;
import java.util.Iterator;

public abstract class Writer {
private static final int FALSE = 244;
Expand Down
5 changes: 0 additions & 5 deletions modules/core/src/main/java/org/dhallj/core/Expr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.dhallj.core;

import java.io.IOException;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
Expand All @@ -11,13 +10,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Expand Down
1 change: 0 additions & 1 deletion modules/core/src/main/java/org/dhallj/core/ToStringVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.URI;
import java.nio.charset.Charset;
import java.nio.file.Path;
import java.util.Iterator;
import java.util.List;
Expand Down
9 changes: 4 additions & 5 deletions modules/core/src/main/java/org/dhallj/core/binary/CborDecodingVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package org.dhallj.core.binary;

import org.dhallj.cbor.Reader;
import org.dhallj.cbor.Visitor;
import org.dhallj.core.Expr;
import org.dhallj.core.Operator;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.URI;
Expand All @@ -14,6 +9,10 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.dhallj.cbor.Reader;
import org.dhallj.cbor.Visitor;
import org.dhallj.core.Expr;
import org.dhallj.core.Operator;

/**
* Decodes CBOR expressions corresponding to encoded Dhall expressions.
Expand Down
1 change: 0 additions & 1 deletion modules/core/src/main/java/org/dhallj/core/normalization/BetaNormalizeMerge.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.Map.Entry;
import org.dhallj.core.Expr;
import org.dhallj.core.ExternalVisitor;
import org.dhallj.core.Operator;

final class BetaNormalizeMerge extends ExternalVisitor.Constant<Expr> {
private final List<Entry<String, Expr>> handlers;
Expand Down
1 change: 0 additions & 1 deletion modules/core/src/main/java/org/dhallj/core/normalization/BetaNormalizeToMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.dhallj.core.normalization;

import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import org.dhallj.core.Expr;
Expand Down
9 changes: 0 additions & 9 deletions modules/core/src/main/java/org/dhallj/core/normalization/Shift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
package org.dhallj.core.normalization;

import java.math.BigInteger;
import java.net.URI;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import org.dhallj.core.Expr;
import org.dhallj.core.Operator;
import org.dhallj.core.Source;
import org.dhallj.core.Visitor;

/**
Expand Down
2 changes: 1 addition & 1 deletion modules/core/src/main/java/org/dhallj/core/typechecking/CheckEquivalence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.dhallj.core.typechecking;

import org.dhallj.core.Expr;
import org.dhallj.core.Operator;
import org.dhallj.core.ExternalVisitor;
import org.dhallj.core.Operator;

final class CheckEquivalence extends ExternalVisitor.Constant<Boolean> {
public static final ExternalVisitor<Boolean> instance = new CheckEquivalence();
Expand Down
2 changes: 1 addition & 1 deletion modules/core/src/main/java/org/dhallj/core/typechecking/TypeCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import java.util.Set;
import java.util.TreeMap;
import org.dhallj.core.Expr;
import org.dhallj.core.Expr.Constants;
import org.dhallj.core.ExternalVisitor;
import org.dhallj.core.Operator;
import org.dhallj.core.Source;
import org.dhallj.core.Expr.Constants;
import org.dhallj.core.normalization.BetaNormalize;

public final class TypeCheck implements ExternalVisitor<Expr> {
Expand Down
2 changes: 1 addition & 1 deletion modules/imports-mini/src/main/java/org/dhallj/imports/mini/Resolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.dhallj.imports.mini;

import java.nio.file.Path;
import org.dhallj.core.DhallException.ResolutionFailure;
import org.dhallj.core.Expr;
import java.nio.file.Path;

public final class Resolver {
public static final Expr resolve(Expr expr, boolean integrityChecks, Path currentPath)
Expand Down
2 changes: 0 additions & 2 deletions modules/parser/src/main/java/org/dhallj/parser/support/ParsingHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package org.dhallj.parser.support;

import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.ArrayList;
Expand Down
2 changes: 0 additions & 2 deletions modules/prelude/src/main/java/org/dhallj/prelude/Prelude.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import java.math.BigInteger;
import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import org.dhallj.core.Expr;
import org.dhallj.core.Operator;
Expand Down
2 changes: 1 addition & 1 deletion modules/yaml/src/main/java/org/dhallj/yaml/YamlConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import org.dhallj.core.Expr;
import org.dhallj.core.converters.JsonConverter;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;

public class YamlConverter {
private static final DumperOptions defaultOptions = new DumperOptions();
Expand Down
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 @@ -3,7 +3,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
Expand Down