Merge pull request #23033 Fix remaining configuration cache compatibi…

…lity issues in docs Fixes #21027 Co-authored-by: Mikhail Lopatkin <mlopatkin@gradle.com>
gradle · Dec 8, 2022 · efd2931 · efd2931
2 parents b129b77 + 8a969c0
commit efd2931
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/subprojects/docs/src/docs/userguide/core-plugins/project_report_plugin.adoc b/subprojects/docs/src/docs/userguide/core-plugins/project_report_plugin.adoc
@@ -15,6 +15,8 @@
 [[project_report_plugin]]
 = The Project Report Plugin
 
+WARNING: The Project report plugin is not compatible with the <<configuration_cache.adoc#config_cache:plugins:core,configuration cache>>.
+
 The Project report plugin adds some tasks to your project which generate reports containing useful information about your build. These tasks generate the same content that you get by executing the `tasks`, `dependencies`, and `properties` tasks from the command line (see <<command_line_interface.adoc#sec:command_line_project_reporting,Command-line project reporting>>). In contrast to the command line reports, the report plugin generates the reports into a file. There is also an aggregating task that depends on all report tasks added by the plugin.
 
 We plan to add much more to the existing reports and create additional ones in future releases of Gradle.

diff --git a/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/groovy/build.gradle b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/groovy/build.gradle
@@ -114,9 +114,10 @@ tasks.register('packageFiles2', Zip) {
 
 // tag::adhoc-destroyable-task[]
 tasks.register('removeTempDir') {
-    destroyables.register(layout.projectDirectory.dir('tmpDir'))
+    def tempDir = layout.projectDirectory.dir('tmpDir')
+    destroyables.register(tempDir)
     doLast {
-        delete(layout.projectDirectory.dir('tmpDir'))
+        tempDir.asFile.deleteDir()
     }
 }
 // end::adhoc-destroyable-task[]

diff --git a/...s/docs/src/snippets/tasks/incrementalBuild-customTaskClass/groovy/src/headers/headers.txt b/...s/docs/src/snippets/tasks/incrementalBuild-customTaskClass/groovy/src/headers/headers.txt
diff --git a/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/build.gradle.kts b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/build.gradle.kts
@@ -114,13 +114,14 @@ tasks.register<Zip>("packageFiles2") {
 
 // tag::adhoc-destroyable-task[]
 tasks.register("removeTempDir") {
-    destroyables.register(layout.projectDirectory.dir("tmpDir"))
+    val tmpDir = layout.projectDirectory.dir("tmpDir")
+    destroyables.register(tmpDir)
     doLast {
-        delete(layout.projectDirectory.dir("tmpDir"))
+        tmpDir.asFile.deleteRecursively()
     }
 }
 // end::adhoc-destroyable-task[]
 
 tasks.build {
-    dependsOn(processTemplates, "processTemplatesAdHoc", "processTemplatesAdHocSkipWhenEmpty", "processTemplatesWithExtraInputs", "processTemplatesWithoutAnnotations")
+    dependsOn(processTemplates, "processTemplatesAdHoc", "processTemplatesAdHocSkipWhenEmpty", "processTemplatesWithExtraInputs")
 }
diff --git a/...s/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/src/headers/headers.txt b/...s/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/src/headers/headers.txt
diff --git a/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/build.sample.conf b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/build.sample.conf
@@ -0,0 +1,2 @@
+executable: gradle
+args: build
diff --git a/.../docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/removeTempDir.sample.conf b/.../docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/removeTempDir.sample.conf
@@ -0,0 +1,2 @@
+executable: gradle
+args: removeTempDir