From 8303eaba4c859f8b32a97cd498a177fe80d40a9d Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Thu, 18 Jan 2018 18:37:11 -0600
Subject: [PATCH] Override specific "cleanFooBar" tasks instead of generic
 "clean"

---
 com.ibm.wala.cast.java.test.data/build.gradle |  8 +++----
 com.ibm.wala.core.testdata/build.gradle       | 24 +++++++++++++++----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/com.ibm.wala.cast.java.test.data/build.gradle b/com.ibm.wala.cast.java.test.data/build.gradle
index d83a02122..39bfdf30b 100644
--- a/com.ibm.wala.cast.java.test.data/build.gradle
+++ b/com.ibm.wala.cast.java.test.data/build.gradle
@@ -15,13 +15,13 @@ task downloadJLex(type: de.undercouch.gradle.tasks.download.Download) {
 	overwrite false
 }
 
+task cleanDownloadJLex(type: Delete) {
+	delete downloadJLex.dest.parent
+}
+
 task verifyJLex(type: VerifyWithStamp, dependsOn: downloadJLex) {
 	src downloadJLex.dest
 	checksum 'fe0cff5db3e2f0f5d67a153cf6c783af'
 }
 
-clean {
-	delete downloadJLex.dest.parent
-}
-
 compileTestJava.dependsOn verifyJLex
diff --git a/com.ibm.wala.core.testdata/build.gradle b/com.ibm.wala.core.testdata/build.gradle
index fa67676e2..145769c7e 100644
--- a/com.ibm.wala.core.testdata/build.gradle
+++ b/com.ibm.wala.core.testdata/build.gradle
@@ -56,7 +56,10 @@ task downloadJavaCup(type: Download) {
 	src 'http://www2.cs.tum.edu/projects/cup/java-cup-11a.jar'
 	dest projectDir
 	overwrite false
-	clean { delete downloadJavaCup }
+}
+
+task cleanDownloadJavaCup(type: Delete) {
+	delete downloadJavaCup
 }
 
 task verifyJavaCup(type: VerifyWithStamp, dependsOn: downloadJavaCup) {
@@ -75,7 +78,10 @@ task collectJLex(type: Jar) {
 	include 'JLex/'
 	baseName 'JLex'
 	destinationDir projectDir
-	clean { delete collectJLex }
+}
+
+task cleanCollectJLex(type: Delete) {
+	delete collectJLex
 }
 
 
@@ -113,8 +119,10 @@ task generateHelloHash(type: JavaExec, dependsOn: unpackOcamlJava) {
 	classpath new File(ocamlJavaHome, 'lib/ocamljava.jar')
 	main 'ocaml.compilers.ocamljavaMain'
 	inputs.dir ocamlJavaHome
+}
 
-	clean { delete generateHelloHash }
+task cleanGenerateHelloHash(type: Delete) {
+	delete generateHelloHash
 }
 
 
@@ -130,7 +138,10 @@ task collectTestData(type: Jar) {
 	from 'classes'
 	exclude 'methodLookup'
 	destinationDir projectDir
-	clean { delete collectTestData }
+}
+
+task cleanCollectTestData(type: Delete) {
+	delete collectTestData
 }
 
 
@@ -156,5 +167,8 @@ task collectTestDataA(type: Jar) {
 		'special/*',
 		)
 	destinationDir projectDir
-	clean { delete collectTestDataA }
+}
+
+task cleanColllectTestDataA(type: Delete) {
+	delete collectTestDataA
 }