Skip to content

spotlessApply no longer clobbers file permissions #656

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

Merged
nedtwigg merged 9 commits into from
Aug 5, 2020
Merged

spotlessApply no longer clobbers file permissions #656

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
40e4305
Fix for issue 654 ... copy the original file to the tmp location just…
tglaeser Aug 1, 2020
0019984
Fix for issue 654 ... fixing java.nio.file.FileAlreadyExistsException
tglaeser Aug 1, 2020
d537dd4
Fix for issue 654 ... adding unit test
tglaeser Aug 1, 2020
63d8579
Fix for issue 654 ... again, many of the types from Java package 'jav…
tglaeser Aug 1, 2020
c1747c0
Fix for issue 654 ... add entry to change log
tglaeser Aug 1, 2020
597c3dd
Revert "Fix for issue 654 ... again, many of the types from Java pack…
nedtwigg Aug 5, 2020
c6d63f0
Revert "Fix for issue 654 ... adding unit test"
nedtwigg Aug 5, 2020
4c3a399
Create a failing test to reproduce #654.
nedtwigg Aug 5, 2020
6fe2c55
Fix the failing test with @tglaeser's PR.
nedtwigg Aug 5, 2020
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 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
File originalSource = new File(getProject().getProjectDir(), path);
try {
getLogger().debug("Copying " + fileVisitDetails.getFile() + " to " + originalSource);
Files.copy(fileVisitDetails.getFile().toPath(), originalSource.toPath(), StandardCopyOption.REPLACE_EXISTING);
Files.copy(fileVisitDetails.getFile().toPath(), originalSource.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
} catch (IOException e) {
throw new RuntimeException(e);
}
Expand Down
3 changes: 3 additions & 0 deletions plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.Comparator;

import org.gradle.api.GradleException;
Expand Down Expand Up @@ -80,6 +81,8 @@ private void processInputFile(Formatter formatter, File input) throws IOExceptio
throw new IllegalStateException("Every file has a parent folder.");
}
Files.createDirectories(parentDir);
// Need to copy the original file to the tmp location just to remember the file attributes
Files.copy(input.toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
dirtyState.writeCanonicalTo(output);
}
}
Expand Down