Skip to content

Commit 4dfc4c8

Browse files
committed
Better encapsulation - force SpotlessTask clients to use getters.
1 parent f828147 commit 4dfc4c8

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ static void performHook(SpotlessTaskImpl spotlessTask) {
4242
}
4343
if (spotlessTask.getTarget().contains(file)) {
4444
try (Formatter formatter = spotlessTask.buildFormatter()) {
45-
if (spotlessTask.ratchet != null) {
46-
if (spotlessTask.ratchet.isClean(spotlessTask.getProjectDir().get().getAsFile(), spotlessTask.rootTreeSha, file)) {
45+
if (spotlessTask.getRatchet() != null) {
46+
if (spotlessTask.getRatchet().isClean(spotlessTask.getProjectDir().get().getAsFile(), spotlessTask.getRootTreeSha(), file)) {
4747
dumpIsClean();
4848
return;
4949
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ public void setLineEndingsPolicy(LineEnding.Policy lineEndingsPolicy) {
6969

7070
/*** API which performs git up-to-date tasks. */
7171
@Nullable
72-
GitRatchetGradle ratchet;
72+
private GitRatchetGradle ratchet;
7373
/** The sha of the tree at repository root, used for determining if an individual *file* is clean according to git. */
74-
ObjectId rootTreeSha;
74+
private ObjectId rootTreeSha;
7575
/**
7676
* The sha of the tree at the root of *this project*, used to determine if the git baseline has changed within this folder.
7777
* Using a more fine-grained tree (rather than the project root) allows Gradle to mark more subprojects as up-to-date

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private void processInputFile(Formatter formatter, File input) throws IOExceptio
9292
File output = getOutputFile(input);
9393
getLogger().debug("Applying format to " + input + " and writing to " + output);
9494
PaddedCell.DirtyState dirtyState;
95-
if (ratchet != null && ratchet.isClean(getProjectDir().get().getAsFile(), rootTreeSha, input)) {
95+
if (getRatchet() != null && getRatchet().isClean(getProjectDir().get().getAsFile(), getRootTreeSha(), input)) {
9696
dirtyState = PaddedCell.isClean();
9797
} else {
9898
dirtyState = PaddedCell.calculateDirtyState(formatter, input);

0 commit comments

Comments
 (0)