Skip to content

Commit

Permalink
Use Spotless version 6.19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst authored May 24, 2023
1 parent dd2d8ab commit 62a9414
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

// Code formatting; defines targets "spotlessApply" and "spotlessCheck"
// Requires JDK 11 or higher; the plugin crashes under JDK 8.
id 'com.diffplug.spotless' version '6.18.0'
id 'com.diffplug.spotless' version '6.19.0'

// Error Prone linter
id('net.ltgt.errorprone') version '3.1.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -449,10 +449,13 @@ static enum Action {
// Shorter variants
/** Clone a repository. */
private static Action CLONE = Action.CLONE;

/** Show the working tree status. */
private static Action STATUS = Action.STATUS;

/** Pull changes from upstream. */
private static Action PULL = Action.PULL;

/** List the known repositories. */
private static Action LIST = Action.LIST;

Expand Down Expand Up @@ -655,10 +658,13 @@ static enum RepoType {
static class Checkout {
/** The type of repository to clone. */
RepoType repoType;

/** Local directory. */
File directory;

/** Local directory (canonical version). */
String canonicalDirectory;

/**
* Non-null for CVS and SVN. May be null for distributed version control systems (Bzr, Git, Hg).
* For distributed systems, refers to the parent repository from which this was cloned, not the
Expand All @@ -667,6 +673,7 @@ static class Checkout {
* <p>Most operations don't need this. It is needed for checkout, though.
*/
@Nullable String repository;

/**
* Null if no module, just whole thing. Non-null for CVS and, optionally, for SVN. Null for
* distributed version control systems (Bzr, Git, Hg).
Expand Down Expand Up @@ -1269,6 +1276,7 @@ static Checkout dirToCheckoutGit(File gitDir, File parentDir) {
static class FilePair {
/** The first file. */
final @Nullable File file1;

/** The second file. */
final @Nullable File file2;

Expand Down Expand Up @@ -1355,6 +1363,7 @@ private void addArgs(ProcessBuilder pb, List<String> args) {
private static class Replacer {
/** The regular expression matching text that should be replaced. */
Pattern regexp;

/** The replacement text. */
String replacement;

Expand Down

0 comments on commit 62a9414

Please sign in to comment.