From 99295fcff7cfca8be6fae6d51e3629de76a51b68 Mon Sep 17 00:00:00 2001 From: Simon Taddiken Date: Thu, 6 Apr 2023 10:56:55 +0200 Subject: [PATCH 1/5] Add @DisableCachingByDefault to give a proper hint why task outputs are not cached --- .../diffplug/gradle/spotless/RegisterDependenciesTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java index 75bd06406b..114900f689 100644 --- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java +++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 DiffPlug + * Copyright 2016-2023 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.TaskAction; import org.gradle.build.event.BuildEventsListenerRegistry; +import org.gradle.work.DisableCachingByDefault; import com.diffplug.common.base.Preconditions; import com.diffplug.common.io.Files; @@ -46,6 +47,7 @@ * - When this "registerDependencies" task does its up-to-date check, it queries the task execution graph to see which * SpotlessTasks are at risk of being executed, and causes them all to be evaluated safely in the root buildscript. */ +@DisableCachingByDefault(because = "I/O bound task not worth caching") public abstract class RegisterDependenciesTask extends DefaultTask { static final String TASK_NAME = "spotlessInternalRegisterDependencies"; From 6cf5254a5e1da61b7a1b92df4be95fab341a85d7 Mon Sep 17 00:00:00 2001 From: Simon Taddiken Date: Thu, 6 Apr 2023 11:35:40 +0200 Subject: [PATCH 2/5] Update changelog of plugin-gradle --- plugin-gradle/CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 05f497d1e3..84e51fc50d 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -19,6 +19,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`. The same configuration exists for `greclipse` and `eclipseCdt`. * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)). +* Added `@DisableCachingByDefault` to `RegisterDependenciesTask`. + ### Fixed * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618)) ### Changes From 2dcd726137a9c1189ef1bd2ade048b3f657c50f2 Mon Sep 17 00:00:00 2001 From: Simon Taddiken Date: Thu, 6 Apr 2023 11:36:12 +0200 Subject: [PATCH 3/5] Remove extra blank line --- plugin-gradle/CHANGES.md | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 84e51fc50d..552586915d 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -20,7 +20,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( The same configuration exists for `greclipse` and `eclipseCdt`. * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)). * Added `@DisableCachingByDefault` to `RegisterDependenciesTask`. - ### Fixed * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618)) ### Changes From fd41613786b28a5e92a134bc7ec1965faa7e7900 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 6 Apr 2023 14:36:24 -0700 Subject: [PATCH 4/5] Update hint. --- .../com/diffplug/gradle/spotless/RegisterDependenciesTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java index 114900f689..bdeb9d7d94 100644 --- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java +++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java @@ -47,7 +47,7 @@ * - When this "registerDependencies" task does its up-to-date check, it queries the task execution graph to see which * SpotlessTasks are at risk of being executed, and causes them all to be evaluated safely in the root buildscript. */ -@DisableCachingByDefault(because = "I/O bound task not worth caching") +@DisableCachingByDefault(because = "This task coordinates the setup and execution of other tasks, and should not be cached") public abstract class RegisterDependenciesTask extends DefaultTask { static final String TASK_NAME = "spotlessInternalRegisterDependencies"; From 029acd6fc284bb66d1e86f424775cb5a68d9c04f Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 6 Apr 2023 14:37:01 -0700 Subject: [PATCH 5/5] Put changelog entry in the correct place. --- plugin-gradle/CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 552586915d..becf2e5ac7 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -3,6 +3,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`). ## [Unreleased] +### Fixed +* Added `@DisableCachingByDefault` to `RegisterDependenciesTask`. ## [6.18.0] - 2023-04-06 ### Added @@ -19,7 +21,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`. The same configuration exists for `greclipse` and `eclipseCdt`. * The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)). -* Added `@DisableCachingByDefault` to `RegisterDependenciesTask`. ### Fixed * Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618)) ### Changes