chore: More laziness on some Gradle configurations and jvmArgs

Author: bric3

dd-smoke-tests/junit-console/build.gradle

@@ -1,6 +1,3 @@
-import java.time.Duration
-import java.time.temporal.ChronoUnit
-
 apply from: "$rootDir/gradle/java.gradle"
 description = 'JUnit Console Smoke Tests.'
 
@@ -11,7 +8,16 @@ dependencies {
 }
 
 tasks.withType(Test).configureEach {
-  jvmArgs "-Ddatadog.smoketest.junit.console.jar.path=${configurations.runtimeClasspath.find { it.name.contains('junit-platform-console-standalone') }}"
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        def consoleJarFile = configurations.named("runtimeClasspath")
+          .get()
+          .find { it.name.contains("junit-platform-console-standalone") }
+
+        return ["-Ddatadog.smoketest.junit.console.jar.path=${consoleJarFile}"]
+      }
+    })
 
   if (project.hasProperty("mavenRepositoryProxy")) {
     // propagate proxy URL to tests, to then propagate it to nested Gradle builds

dd-smoke-tests/springboot-tomcat/build.gradle

@@ -43,19 +43,20 @@ dependencies {
 
 tasks.register("unzip", Copy) {
   def zipFileNamePrefix = "tomcat"
-  def zipPath = project.configurations.serverFile.find {
-    it.name.startsWith(zipFileNamePrefix)
-  }
-  if (zipPath != null) {
-    def zipFile = file(zipPath)
-    def outputDir = file("${buildDir}")
-
-    from zipTree(zipFile)
-    into outputDir
-  } else {
-    throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix)
+  def serverZipTree = providers.provider {
+    // eager access
+    def zipPath = project.configurations.serverFile.find {
+      it.name.startsWith(zipFileNamePrefix)
+    }
+    if (zipPath == null) {
+      throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix)
+    }
+    zipTree(zipPath)
   }
 
+  from serverZipTree
+  into layout.buildDirectory
+
   // When tests are disabled this would still be run, so disable this manually
   onlyIf { !project.rootProject.hasProperty("skipTests") }
 }