Support configuration cache + tasks from inlucded builds

Large refactor to support configuration cache.
Also include task dependencies form included builds (and thier sub-trees)

Bump plugin version to 4.0.0

Author: dorongold

CHANGELOG.md

@@ -4,50 +4,61 @@ Changelog
 This changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).  
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+Version 4.0.0 (2024-06-11)
+----------------------------
+* Minimum supported Gradle version bumped to 7.6.
+* Compatibility with Gradle Configuration Cache.
+* Support for tasks from included builds:
+  * Tasks from included builds (and their task dependency sub-trees) will appear in the task tree, just like tasks from the main build.
+  * **Note**: Only tasks that are part of the task tree rooted at an entry task will be shown.
+  Tasks from included builds that Gradle runs automatically before the main task graph is ready (e.g. `:<included project>:compileJava`) will not appear in the task tree.
+* The plugin no longer applies itself to all subprojects. Instead, the `taskTree` task is registered in all subprojects. This should slightly reduce this plugin's footprint (performance-wise) in large multi-projects.
+
+
 Version 3.0.0 (2024-03-29)
 ----------------------------
-* Add option `--with-description` to print task descriptions
-* Omit inputs, outputs and task descriptions for repeated tree nodes
+* Add option `--with-description` to print task descriptions.
+* Omit inputs, outputs and task descriptions for repeated tree nodes.
 
 Version 2.1.1 (2022-12-31)
 ----------------------------
-* Support Gradle 7.6
+* Support Gradle 7.6.
 
 Version 2.1.0 (2021-07-01)
 ----------------------------
-* Use [Task Configuration Avoidance](https://docs.gradle.org/current/userguide/task_configuration_avoidance.html)
+* Use [Task Configuration Avoidance](https://docs.gradle.org/current/userguide/task_configuration_avoidance.html).
 
 Version 2.0.1 (2021-07-01)
 ----------------------------
-* Upgrade `org.apache.commons:commons-lang3` due to vulnerability
+* Upgrade `org.apache.commons:commons-lang3` due to vulnerability.
 
 Version 2.0 (2021-07-01)
 ----------------------------
-* Support Gradle 6.8 and make it the minimum supported Gradle version
-* Add options `--with-inputs` and `--with-outputs` to print task inputs and outputs
-* Change option `--task-depth` to `--depth`
+* Support Gradle 6.8 and make it the minimum supported Gradle version.
+* Add options `--with-inputs` and `--with-outputs` to print task inputs and outputs.
+* Change option `--task-depth` to `--depth`.
 * Change default behavior to _not_ repeat an already printed sub-tree. Option `--no-repeat` replaced with `--repeat`.
 
 Version 1.5 (2020-01-01)
 ----------------------------
-* Compatibility with gradle 6
+* Compatibility with gradle 6.
 
 Version 1.4 (2019-06-01)
 ----------------------------
 * Add `--task-depth` option to limit tree depth.
-* Fix bug: `No such property task for class TransformInfo$ChainedTransformInfo`
+* Fix bug: `No such property task for class TransformInfo$ChainedTransformInfo`.
 
 Version 1.3.1 (2018-10-08)
 ----------------------------
 
-* Compatibility with gradle version 5.0-milestone-1
+* Compatibility with gradle version 5.0-milestone-1.
 
 Version 1.3 (2017-03-04)
 ----------------------------
 
-* Compatibility with all gradle versions >= 2.3
-* Update gradle wrapper to 3.4
+* Compatibility with all gradle versions >= 2.3.
+* Update gradle wrapper to 3.4.
 * Better multi-project handling:
    - Applying the plugin on the root project adds the taskTree task to all child projects.
-   - Applying the plugin under `allrojects`  or `subprojects` exhibits the same behavior (and does not fail anymore due to `task taskTree is already defined`)
+   - Applying the plugin under `allrojects`  or `subprojects` exhibits the same behavior (and does not fail anymore due to `task taskTree is already defined`).
 

README.md

@@ -130,11 +130,12 @@ In a multi-project, it is recommended to apply the plugin on the root project on
 I.e. it is unnecessary to apply this plugin under `allprojects` or `subprojects`.
 
 ## Version Compatibility
-Gradle 6.8+  
+Gradle 7.6+
 Java 1.8+
 
 ## Older Version Compatibility
-Version 1.5 of this plugin is compatible with Gradle 2.3+
+Version 3.0.0 of this plugin is compatible with Gradle 6.8 - 7.5.1
+Version 1.5 of this plugin is compatible with Gradle 2.3 - 6.7.1
 
 ## IntelliJ Plugin
 [reveal-dependency-plugin](https://github.com/jvmlet/reveal-dependency-plugin) can print the task dependency tree inside IntelliJ.

build.gradle

@@ -1,17 +1,6 @@
-apply plugin: 'groovy'
-apply plugin: 'java-gradle-plugin'
-apply plugin: 'maven-publish'
-apply plugin: 'com.gradle.plugin-publish'
-
-buildscript {
-    repositories {
-        maven {
-            url 'https://plugins.gradle.org/m2/'
-        }
-    }
-    dependencies {
-        classpath 'com.gradle.publish:plugin-publish-plugin:0.21.0'
-    }
+plugins {
+    id 'com.gradle.plugin-publish' version '1.2.1'
+    id 'groovy'
 }
 
 repositories {
@@ -25,52 +14,45 @@ java {
 }
 
 group = 'com.dorongold.plugins'
-version = '3.0.0'
+version = '4.0.0'
 description = "Gradle plugin that adds a 'taskTree' task that prints task dependency tree"
 
-//Building a text file that contains the classpath of the plugin code. needed for testing on gradle versions prior to 2.5
-task createClasspathManifest {
-    def outputDir = file("$buildDir/$name")
-
-    inputs.files sourceSets.main.runtimeClasspath
-    outputs.dir outputDir
-
-    doLast {
-        outputDir.mkdirs()
-        file("$outputDir/plugin-classpath.txt").text = sourceSets.main.runtimeClasspath.join("\n")
-    }
-}
-
 dependencies {
-    implementation localGroovy()
-    implementation 'org.apache.commons:commons-lang3:3.5'
+    // mandatory dependencies for using Spock
+    implementation platform('org.codehaus.groovy:groovy-bom:3.0.21')
+    implementation 'org.codehaus.groovy:groovy'
 
-    testImplementation('org.spockframework:spock-core:1.0-groovy-2.4') {
-        exclude module: 'groovy-all'
+    implementation 'org.apache.commons:commons-lang3:3.14.0'
+
+    testImplementation platform("org.spockframework:spock-bom:2.3-groovy-3.0") {
+        exclude group: 'org.codehaus.groovy'
     }
-    testImplementation 'com.netflix.nebula:nebula-test:5.0.1'
-    testImplementation 'commons-io:commons-io:2.5'
-    testRuntimeOnly files(createClasspathManifest)
+    testImplementation "org.spockframework:spock-core"
+    testImplementation "org.spockframework:spock-junit4"  // you can remove this if your code does not rely on old JUnit 4 rules
+    testImplementation 'com.netflix.nebula:nebula-test:10.6.1'
+    testImplementation 'commons-io:commons-io:2.16.1'
 }
 
-pluginBundle {
+gradlePlugin {
     website = 'https://github.com/dorongold/gradle-task-tree'
     vcsUrl = 'https://github.com/dorongold/gradle-task-tree.git'
-    vcsUrl = 'https://github.com/dorongold/gradle-task-tree.git'
-    description = "Gradle plugin that adds a 'taskTree' task that prints task dependency tree"
-    tags = ['task', 'tree', 'dependencies', 'dependency']
 
     plugins {
         taskTreePlugin {
             id = 'com.dorongold.task-tree'
             displayName = 'Gradle Task Tree Plugin'
+            description = "Gradle plugin that adds a 'taskTree' task that prints task dependency tree"
+            tags.addAll('task', 'tree', 'dependencies', 'dependency')
+            implementationClass = 'com.dorongold.gradle.tasktree.TaskTreePlugin'
         }
     }
 }
 
 test {
+    useJUnitPlatform()
     testLogging {
 //        showStandardStreams = true
+        events "passed", "skipped", "failed"
         exceptionFormat = 'full'
     }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists