Improve Gradle build cacheability (#5188)

* Bump up Gradle plugins version
* Allow cache relocatability for Delombok task
* Declare Delombok task inputs/outputs inside DelombokArgumentProvider

Author: jprinet

build.gradle

@@ -43,18 +43,14 @@ subprojects {
         version = '1.18.20'
     }
 
+
     task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
-        def outputDir = file("$buildDir/delombok")
-        outputs.dir(outputDir)
         outputs.cacheIf {
             true
         }
-        for (srcDir in project.sourceSets.main.java.srcDirs) {
-            // TODO: named input and relative path for `srcDir` to make task more cacheable
-            inputs.dir(srcDir)
-            // TODO: `outputDir` as relative path to make task more cacheable 
-            args(srcDir, "-d", outputDir, "-f", "generateDelombokComment:skip")
-        }
+        argumentProviders.addAll(
+            new org.testcontainers.build.DelombokArgumentProvider(srcDirs: project.sourceSets.main.java.srcDirs, outputDir: file("$buildDir/delombok"))
+        )
     }
     delombok.onlyIf {
         project.sourceSets.main.java.srcDirs.find { it.exists() }

buildSrc/src/main/groovy/org/testcontainers/build/DelombokArgumentProvider.groovy

@@ -0,0 +1,26 @@
+package org.testcontainers.build
+
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.process.CommandLineArgumentProvider
+
+/**
+ * Allows build cache relocatability for Delombok task
+ */
+class DelombokArgumentProvider implements CommandLineArgumentProvider {
+
+    @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
+    Set<File> srcDirs
+
+    @OutputDirectory
+    File outputDir
+
+    @Override
+    Iterable<String> asArguments() {
+        return [srcDirs.collect { it.absolutePath }.join(" "), "-d", outputDir.absolutePath, "-f", "generateDelombokComment:skip"]
+    }
+
+}

settings.gradle

@@ -5,8 +5,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.9"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.6.5"
     }
 }