From dfe9f95c9d1a6d8affdb65202cd9d1934df2297b Mon Sep 17 00:00:00 2001 From: Mikhail Lopatkin Date: Wed, 7 Dec 2022 12:12:36 +0100 Subject: [PATCH 1/3] Fix tasks/incrementalBuild-incrementalBuildAdvanced CC compatibility Referencing project.layout and project.delete at execution time is not possible. Standard Groovy/Kotlin API are used to delete directory, as there's no simple and CC-compatible replacement yet, only the injectable service. --- .../incrementalBuild-customTaskClass/groovy/build.gradle | 5 +++-- .../incrementalBuild-customTaskClass/kotlin/build.gradle.kts | 5 +++-- .../tests/removeTempDir.sample.conf | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/removeTempDir.sample.conf diff --git a/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/groovy/build.gradle b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/groovy/build.gradle index 34f0c3eeff67..03f6691406f1 100644 --- 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/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/build.gradle.kts b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/build.gradle.kts index 0708bd4f416d..efff450473d5 100644 --- 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,9 +114,10 @@ tasks.register("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[] diff --git a/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/removeTempDir.sample.conf b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/removeTempDir.sample.conf new file mode 100644 index 000000000000..442d5b6c083b --- /dev/null +++ b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/removeTempDir.sample.conf @@ -0,0 +1,2 @@ +executable: gradle +args: removeTempDir From 4bc09f1d7b8731f1f553b93a37e1827cb5ea8b6a Mon Sep 17 00:00:00 2001 From: Mikhail Lopatkin Date: Wed, 7 Dec 2022 12:41:15 +0100 Subject: [PATCH 2/3] Note that the Project Report plugin is not compatible with CC --- .../src/docs/userguide/core-plugins/project_report_plugin.adoc | 2 ++ 1 file changed, 2 insertions(+) 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 index 2b131dab67e9..8649c365f98c 100644 --- 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 <>. + 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 <>). 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. From 8a969c02457d26d658f2d096df029cce8f431dec Mon Sep 17 00:00:00 2001 From: Mikhail Lopatkin Date: Wed, 7 Dec 2022 20:42:29 +0100 Subject: [PATCH 3/3] Add missing test coverage for tasks/incrementalBuild-customTaskClass --- .../groovy/src/headers/headers.txt | 0 .../incrementalBuild-customTaskClass/kotlin/build.gradle.kts | 2 +- .../kotlin/src/headers/headers.txt | 0 .../incrementalBuild-customTaskClass/tests/build.sample.conf | 2 ++ 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/groovy/src/headers/headers.txt create mode 100644 subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/src/headers/headers.txt create mode 100644 subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/build.sample.conf diff --git a/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/groovy/src/headers/headers.txt b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/groovy/src/headers/headers.txt new file mode 100644 index 000000000000..e69de29bb2d1 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 index efff450473d5..3aca699e4b17 100644 --- a/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/build.gradle.kts +++ b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/build.gradle.kts @@ -123,5 +123,5 @@ tasks.register("removeTempDir") { // end::adhoc-destroyable-task[] tasks.build { - dependsOn(processTemplates, "processTemplatesAdHoc", "processTemplatesAdHocSkipWhenEmpty", "processTemplatesWithExtraInputs", "processTemplatesWithoutAnnotations") + dependsOn(processTemplates, "processTemplatesAdHoc", "processTemplatesAdHocSkipWhenEmpty", "processTemplatesWithExtraInputs") } diff --git a/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/src/headers/headers.txt b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/kotlin/src/headers/headers.txt new file mode 100644 index 000000000000..e69de29bb2d1 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 new file mode 100644 index 000000000000..1e81660926b4 --- /dev/null +++ b/subprojects/docs/src/snippets/tasks/incrementalBuild-customTaskClass/tests/build.sample.conf @@ -0,0 +1,2 @@ +executable: gradle +args: build