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.

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

Run javafmt #85

Merged
merged 1 commit into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck

- shell: bash
run: sbt '++ ${{ matrix.scala }}' test scripted
run: sbt '++ ${{ matrix.scala }}' javafmtCheckAll test scripted

- name: Compress target directories
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ ThisBuild / githubWorkflowBuildMatrixExclusions ++= {
MatrixExclude(Map("scala" -> sv, "java" -> "temurin@17", "os" -> "windows-latest")),
)
}
ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "scripted")))
ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("javafmtCheckAll", "test", "scripted")))
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
ThisBuild / githubWorkflowPublishTargetBranches :=
Seq(RefPredicate.StartsWith(Ref.Tag("v")))
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,26 @@
*/
public class JupiterFramework implements Framework {

private static final StreamPair system = new StreamPair(System.out, System.err);
private static final Fingerprint[] FINGERPRINTS = new Fingerprint[] {
new JupiterTestFingerprint()
};
private static final StreamPair system = new StreamPair(System.out, System.err);
private static final Fingerprint[] FINGERPRINTS =
new Fingerprint[] {new JupiterTestFingerprint()};

/**
* @return The human-friendly name of the Jupiter test framework.
*/
@Override
public String name() {
/** @return The human-friendly name of the Jupiter test framework. */
@Override
public String name() {

return "Jupiter";
}
return "Jupiter";
}

@Override
public Fingerprint[] fingerprints() {
@Override
public Fingerprint[] fingerprints() {

return FINGERPRINTS;
}
return FINGERPRINTS;
}

@Override
public Runner runner(String[] args, String[] remoteArgs, ClassLoader testClassLoader) {
@Override
public Runner runner(String[] args, String[] remoteArgs, ClassLoader testClassLoader) {

return new JupiterRunner(args, remoteArgs, testClassLoader, system);
}
return new JupiterRunner(args, remoteArgs, testClassLoader, system);
}
}
Loading