Skip to content

Commit a40ccc1

Browse files
committed
Run formatter
1 parent b5f1251 commit a40ccc1

File tree

18 files changed

+36
-53
lines changed

18 files changed

+36
-53
lines changed

lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2024 DiffPlug
2+
* Copyright 2016-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 DiffPlug
2+
* Copyright 2023-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2024 DiffPlug
2+
* Copyright 2016-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 DiffPlug
2+
* Copyright 2023-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@
2323

2424
import javax.annotation.Nullable;
2525

26-
import com.diffplug.spotless.biome.BiomeSettings;
2726
import org.gradle.api.Project;
2827

2928
import com.diffplug.spotless.FormatterStep;
29+
import com.diffplug.spotless.biome.BiomeSettings;
3030
import com.diffplug.spotless.biome.BiomeStep;
3131

3232
public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
@@ -36,17 +36,15 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
3636
* configuration is used. If this is a relative path, it is resolved against the
3737
* project's base directory.
3838
*/
39-
@Nullable
40-
private Object configPath;
39+
@Nullable private Object configPath;
4140

4241
/**
4342
* Optional directory where the downloaded Biome executable is placed. If this
4443
* is a relative path, it is resolved against the project's base directory.
4544
* Defaults to
4645
* <code>~/.m2/repository/com/diffplug/spotless/spotless-data/biome</code>.
4746
*/
48-
@Nullable
49-
private Object downloadDir;
47+
@Nullable private Object downloadDir;
5048

5149
/**
5250
* Optional path to the Biome executable. Either a <code>version</code> or a
@@ -63,8 +61,7 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
6361
* <code>./executable-name</code> if you want to use an executable in the
6462
* project's base directory.
6563
*/
66-
@Nullable
67-
private Object pathToExe;
64+
@Nullable private Object pathToExe;
6865

6966
/**
7067
* A reference to the Gradle project for which spotless is executed.
@@ -84,8 +81,7 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
8481
* version explicitly. This parameter is ignored when you specify a
8582
* <code>pathToExe</code> explicitly.
8683
*/
87-
@Nullable
88-
private String version;
84+
@Nullable private String version;
8985

9086
protected BiomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, String version) {
9187
this.project = requireNonNull(project);

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 DiffPlug
2+
* Copyright 2024-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,7 @@ public void encoding(String charset) {
216216
protected FileCollection target, targetExclude;
217217

218218
/** The value from which files will be excluded if their content contain it. */
219-
@Nullable
220-
protected String targetExcludeContentPattern = null;
219+
@Nullable protected String targetExcludeContentPattern = null;
221220

222221
protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
223222
String formatterStepName = formatterStep.getName();
@@ -685,17 +684,13 @@ public abstract static class NpmStepConfig<T extends NpmStepConfig<?>> {
685684

686685
public static final String SPOTLESS_NPM_INSTALL_CACHE_DEFAULT_NAME = "spotless-npm-install-cache";
687686

688-
@Nullable
689-
protected Object npmFile;
687+
@Nullable protected Object npmFile;
690688

691-
@Nullable
692-
protected Object nodeFile;
689+
@Nullable protected Object nodeFile;
693690

694-
@Nullable
695-
protected Object npmInstallCache;
691+
@Nullable protected Object npmInstallCache;
696692

697-
@Nullable
698-
protected Object npmrcFile;
693+
@Nullable protected Object npmrcFile;
699694

700695
protected Project project;
701696

@@ -769,11 +764,9 @@ protected void replaceStep() {
769764

770765
public class PrettierConfig extends NpmStepConfig<PrettierConfig> {
771766

772-
@Nullable
773-
Object prettierConfigFile;
767+
@Nullable Object prettierConfigFile;
774768

775-
@Nullable
776-
Map<String, Object> prettierConfig;
769+
@Nullable Map<String, Object> prettierConfig;
777770

778771
final Map<String, String> devDependencies;
779772

@@ -813,8 +806,7 @@ protected FormatterStep createStep() {
813806
* <code>format{ ... }</code>.
814807
*/
815808
public class BiomeGeneric extends BiomeStepConfig<BiomeGeneric> {
816-
@Nullable
817-
String language;
809+
@Nullable String language;
818810

819811
/**
820812
* Creates a new Biome config that downloads the Biome executable for the given

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2024 DiffPlug
2+
* Copyright 2016-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -62,11 +62,9 @@ public static abstract class EslintBaseConfig<T extends EslintBaseConfig<?>>
6262
extends NpmStepConfig<EslintBaseConfig<T>> {
6363
Map<String, String> devDependencies = new LinkedHashMap<>();
6464

65-
@Nullable
66-
Object configFilePath = null;
65+
@Nullable Object configFilePath = null;
6766

68-
@Nullable
69-
String configJs = null;
67+
@Nullable String configJs = null;
7068

7169
public EslintBaseConfig(Project project, Consumer<FormatterStep> replaceStep,
7270
Map<String, String> devDependencies) {

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2024 DiffPlug
2+
* Copyright 2016-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2024 DiffPlug
2+
* Copyright 2016-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -72,11 +72,9 @@ public class TypescriptFormatExtension extends NpmStepConfig<TypescriptFormatExt
7272

7373
private Map<String, Object> config = Collections.emptyMap();
7474

75-
@Nullable
76-
TsConfigFileType configFileType = null;
75+
@Nullable TsConfigFileType configFileType = null;
7776

78-
@Nullable
79-
Object configFilePath = null;
77+
@Nullable Object configFilePath = null;
8078

8179
private final Map<String, String> devDependencies;
8280

@@ -197,8 +195,7 @@ public TypescriptEslintConfig eslint(Map<String, String> devDependencies) {
197195

198196
public class TypescriptEslintConfig extends EslintBaseConfig<TypescriptEslintConfig> {
199197

200-
@Nullable
201-
Object typescriptConfigFilePath = null;
198+
@Nullable Object typescriptConfigFilePath = null;
202199

203200
public TypescriptEslintConfig(Map<String, String> devDependencies) {
204201
super(getProject(), TypescriptExtension.this::replaceStep, devDependencies);

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 DiffPlug
2+
* Copyright 2023-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)