chore: More laziness on some Gradle configurations and jvmArgs

Author: bric3

dd-smoke-tests/osgi/build.gradle

@@ -12,10 +12,10 @@ apply from: "$rootDir/gradle/java.gradle"
 description = 'OSGi Application Smoke Tests.'
 
 configurations {
-  equinox
-  felix
-  knopflerfish
-  bundles
+  register('equinox')
+  register('felix')
+  register('knopflerfish')
+  register('bundles')
 }
 
 configurations.named('bundles') {
@@ -96,16 +96,32 @@ tasks.register('subscribingBundle', Bundle) {
 tasks.withType(Test).configureEach {
   dependsOn "commonBundle", "clientBundle", "messagingBundle", "publishingBundle", "subscribingBundle", "jar"
 
-  jvmArgs "-Ddatadog.smoketest.osgi.appJar.path=${tasks.jar.archiveFile.get()}"
-  jvmArgs "-Ddatadog.smoketest.osgi.equinoxJar.path=${configurations.equinox.first().path}"
-  jvmArgs "-Ddatadog.smoketest.osgi.felixJar.path=${configurations.felix.first().path}"
-  jvmArgs "-Ddatadog.smoketest.osgi.knopflerfishJar.path=${configurations.knopflerfish.first().path}"
-
-  jvmArgs "-Ddatadog.smoketest.osgi.bundle.paths=" +
-    "${tasks.commonBundle.archiveFile.get()}," +
-    "${tasks.clientBundle.archiveFile.get()}," +
-    "${tasks.messagingBundle.archiveFile.get()}," +
-    "${tasks.publishingBundle.archiveFile.get()}," +
-    "${tasks.subscribingBundle.archiveFile.get()}," +
-    "${configurations.bundles*.path.join(',')}"
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+    @Override
+    Iterable<String> asArguments() {
+      def jarTask = tasks.named('jar', Jar).get()
+      def equinoxJar = configurations.named('equinox').get().first().path
+      def felixJar = configurations.named('felix').get().first().path
+      def knopflerfishJar = configurations.named('knopflerfish').get().first().path
+
+      def bundlePaths = [
+          tasks.named('commonBundle', Bundle).get().archiveFile.get(),
+          tasks.named('clientBundle', Bundle).get().archiveFile.get(),
+          tasks.named('messagingBundle', Bundle).get().archiveFile.get(),
+          tasks.named('publishingBundle', Bundle).get().archiveFile.get(),
+          tasks.named('subscribingBundle', Bundle).get().archiveFile.get(),
+          *configurations.named('bundles').get().collect { it.path }
+      ].join(',')
+
+      println(bundlePaths)
+
+      return [
+          "-Ddatadog.smoketest.osgi.appJar.path=${jarTask.archiveFile.get()}",
+          "-Ddatadog.smoketest.osgi.equinoxJar.path=${equinoxJar}",
+          "-Ddatadog.smoketest.osgi.felixJar.path=${felixJar}",
+          "-Ddatadog.smoketest.osgi.knopflerfishJar.path=${knopflerfishJar}",
+          "-Ddatadog.smoketest.osgi.bundle.paths=${bundlePaths}"
+      ]
+    }
+  })
 }