Be lazier when configuring tasks

build.gradle

@@ -96,7 +96,7 @@ subprojects { subproject ->
 
 	// Stash the original Java compiler toolchain in case needed.  This is actually only used by
 	// :com.ibm.wala.cast:compileTestJava, which requires JNI support that ECJ does not offer.
-	tasks.withType(JavaCompile) {
+	tasks.withType(JavaCompile).configureEach {
 		it.ext.originalToolChain = it.toolChain
 		options.encoding = 'UTF-8'
 	}
@@ -110,7 +110,7 @@ subprojects { subproject ->
 		case 'eclipse':
 			apply plugin: 'de.set.ecj'
 			ext.javaCompiler = 'ecj'
-			tasks.withType(JavaCompile) {
+			tasks.withType(JavaCompile).configureEach {
 				options.compilerArgs << '-properties' << "$projectDir/.settings/org.eclipse.jdt.core.prefs"
 			}
 			break
@@ -169,7 +169,7 @@ tasks.register('aggregatedJavadocs', Javadoc) {
 	options.author true
 
 	subprojects.each { proj ->
-		proj.tasks.withType(Javadoc).each { javadocTask ->
+		proj.tasks.withType(Javadoc).configureEach { javadocTask ->
 			source += javadocTask.source
 			classpath += javadocTask.classpath
 			excludes += javadocTask.excludes

com.ibm.wala.cast.java.ecj/build.gradle

@@ -28,7 +28,7 @@ dependencies {
 
 mainClassName = 'com.ibm.wala.cast.java.ecj.util.SourceDirCallGraph'
 
-run {
+tasks.named('run') {
 	// this is for testing purposes
 	final def javaTestData = ':com.ibm.wala.cast.java.test.data'
 	evaluationDependsOn javaTestData

com.ibm.wala.cast/smoke_main/build.gradle

@@ -28,22 +28,27 @@ application {
 					}
 
 					// xlator Java bytecode + implementation of native methods
-					def pathElements = ['../build/classes/java/test', libxlator_test.parent]
+					final pathElements = project.objects.listProperty(File)
+					pathElements.addAll(files('../build/classes/java/test', libxlator_test.parent))
 
 					// "primordial.txt" resource loaded during test
-					def coreResources = project(':com.ibm.wala.core').processResources
-					dependsOn coreResources
-					pathElements << coreResources.destinationDir
+					final coreResources = project(':com.ibm.wala.core').tasks.named('processResources', Copy)
+					pathElements.add(coreResources.map { it.destinationDir })
+					inputs.files coreResources
 
 					// additional supporting Java class files
 					['cast', 'core', 'util'].each {
-						def compileJava = project(":com.ibm.wala.$it").compileJava
-						dependsOn compileJava
-						pathElements << compileJava.destinationDir
+						final compileJava = project(":com.ibm.wala.$it").tasks.named('compileJava', AbstractCompile)
+						pathElements.add(compileJava.map { it.destinationDir })
+						inputs.files compileJava
 					}
 
 					// all combined as a colon-delimited path list
-					args pathElements.join(':')
+					argumentProviders.add(new CommandLineArgumentProvider() {
+						Iterable<String> asArguments() {
+							return [pathElements.get().join(':')]
+						}
+					})
 
 					// log output to file, although we don't validate it
 					final def outFile = file("$temporaryDir/stdout-and-stderr.log")

com.ibm.wala.core/build.gradle

@@ -17,8 +17,10 @@ sourceSets {
 	testSubjects
 }
 
+final Provider<JavaCompile> compileTestSubjectsJava = tasks.named('compileTestSubjectsJava', JavaCompile)
+
 if (javaCompiler == 'ecj') {
-	tasks.named('compileTestSubjectsJava', JavaCompile) {
+	compileTestSubjectsJava.configure {
 		options.compilerArgs << '-err:none'
 		options.compilerArgs << '-warn:none'
 	}
@@ -40,7 +42,7 @@ dependencies {
 			'org.hamcrest:hamcrest-core:2.2',
 	)
 	testRuntimeOnly(
-			files(compileTestSubjectsJava.outputs.files.first())
+			files(compileTestSubjectsJava.map { it.outputs.files.first() })
 	)
 }
 

gradle-mvn-push.gradle

@@ -110,7 +110,7 @@ publishing {
 					from sourceSets.testFixtures.allSource
 				}
 
-				// For eachs subproject with test fixtures, the `artifact` calls below trigger
+				// For each subproject with test fixtures, the `artifact` calls below trigger
 				// creation of three tasks during configuration: `testFixturesJar`,
 				// `testFixturesJavadocJar`, and `testFixturesSourcesJar`.  Configuring those lazily
 				// instead will require a fix to <https://github.com/gradle/gradle/issues/6246>.
@@ -158,7 +158,7 @@ signing {
 }
 
 // Only sign releases; snapshots are unsigned.
-tasks.withType(Sign) {
+tasks.withType(Sign).configureEach {
 	onlyIf {
 		!isSnapshot
 	}
@@ -170,14 +170,14 @@ java {
 }
 
 // Remote publication set goes to remote repositories, so we don't publicly publish test fixtures.
-tasks.withType(PublishToMavenRepository) {
+tasks.withType(PublishToMavenRepository).configureEach {
 	onlyIf {
 		publication == publishing.publications.remote
 	}
 }
 
 // Local publication set goes to local installations, so we can reuse test fixtures locally.
-tasks.withType(PublishToMavenLocal) {
+tasks.withType(PublishToMavenLocal).configureEach {
 	onlyIf {
 		publication == publishing.publications.local
 	}