Skip to content

Commit 29cba64

Browse files
committed
We don't need to move lints to their own place *yet*.
1 parent dfca397 commit 29cba64

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,6 @@ public File getOutputDirectory() {
157157
return outputDirectory;
158158
}
159159

160-
protected File lintDirectory = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(),
161-
"spotless-lint/" + getName());
162-
163-
@OutputDirectory
164-
public File getLintDirectory() {
165-
return lintDirectory;
166-
}
167-
168160
private final ConfigurationCacheHackList stepsInternalRoundtrip = ConfigurationCacheHackList.forRoundtrip();
169161
private final ConfigurationCacheHackList stepsInternalEquality = ConfigurationCacheHackList.forEquality();
170162

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.nio.file.Files;
2121
import java.nio.file.Path;
2222
import java.nio.file.StandardCopyOption;
23-
import java.util.List;
2423

2524
import javax.annotation.Nullable;
2625
import javax.inject.Inject;
@@ -97,7 +96,6 @@ public void performAction(InputChanges inputs) throws Exception {
9796
@VisibleForTesting
9897
void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File input) throws IOException {
9998
File output = getOutputFileWithBaseDir(input, outputDirectory);
100-
File lint = getOutputFileWithBaseDir(input, lintDirectory);
10199
getLogger().debug("Applying format to {} and writing to {}", input, output);
102100
LintState lintState;
103101
if (ratchet != null && ratchet.isClean(getProjectDir().get().getAsFile(), getRootTreeSha(), input)) {
@@ -130,22 +128,15 @@ void processInputFile(@Nullable GitRatchet ratchet, Formatter formatter, File in
130128
var lints = lintState.getLints(formatter);
131129
var first = lints.entrySet().iterator().next();
132130
getExceptionPolicy().handleError(new Throwable(first.getValue().get(0).toString()), first.getKey(), FormatExtension.relativize(getProjectDir().get().getAsFile(), input));
133-
// Files.createDirectories(lint.toPath().getParent());
134-
// Files.write(lint.toPath(), lintState.asString().getBytes());
135-
} else {
136-
Files.deleteIfExists(lint.toPath());
137131
}
138132
}
139133

140134
private void deletePreviousResults(File input) throws IOException {
141135
File output = getOutputFileWithBaseDir(input, outputDirectory);
142-
File lint = getOutputFileWithBaseDir(input, lintDirectory);
143-
for (File file : List.of(output, lint)) {
144-
if (file.isDirectory()) {
145-
getFs().delete(d -> d.delete(file));
146-
} else {
147-
Files.deleteIfExists(file.toPath());
148-
}
136+
if (output.isDirectory()) {
137+
getFs().delete(d -> d.delete(output));
138+
} else {
139+
Files.deleteIfExists(output.toPath());
149140
}
150141
}
151142

0 commit comments

Comments
 (0)