diff --git a/com.ibm.wala.cast.test/build.gradle b/com.ibm.wala.cast.test/build.gradle index cf293a2b1..fa75b9f1c 100644 --- a/com.ibm.wala.cast.test/build.gradle +++ b/com.ibm.wala.cast.test/build.gradle @@ -51,7 +51,7 @@ model { srcDirs = ['harness-src/c'] include 'smoke.cpp' } - generatedBy tasks.generateJniHeaders + generatedBy generateJniHeaders ['cast', 'jdk'].each { lib project: ':com.ibm.wala.cast', library: it } diff --git a/com.ibm.wala.cast/build.gradle b/com.ibm.wala.cast/build.gradle index 78355107e..c337cef9e 100644 --- a/com.ibm.wala.cast/build.gradle +++ b/com.ibm.wala.cast/build.gradle @@ -14,11 +14,11 @@ dependencies { ) } -tasks.javadoc { +javadoc { dependsOn ':com.ibm.wala.cast.js:compileJava' doFirst { - classpath += files(project(':com.ibm.wala.cast.js').tasks.compileJava) + classpath += files(project(':com.ibm.wala.cast.js').compileJava) } } diff --git a/com.ibm.wala.core/build.gradle b/com.ibm.wala.core/build.gradle index 09082faa7..8b1af4b1e 100644 --- a/com.ibm.wala.core/build.gradle +++ b/com.ibm.wala.core/build.gradle @@ -17,10 +17,10 @@ dependencies { ) } -tasks.javadoc { +javadoc { dependsOn ':com.ibm.wala.dalvik:compileJava' doFirst { - classpath += files(project(':com.ibm.wala.dalvik').tasks.compileJava) + classpath += files(project(':com.ibm.wala.dalvik').compileJava) } } diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle index 14b4ae06e..d06375d24 100644 --- a/com.ibm.wala.dalvik.test/build.gradle +++ b/com.ibm.wala.dalvik.test/build.gradle @@ -2,7 +2,7 @@ sourceSets.test { java.srcDirs = ['source'] resources.srcDirs = [ 'data', - project(':com.ibm.wala.core.testdata').tasks.compileTestJava, + project(':com.ibm.wala.core.testdata').compileTestJava, ] } diff --git a/com.ibm.wala.util/build.gradle b/com.ibm.wala.util/build.gradle index f4df6c269..a8f403bb7 100644 --- a/com.ibm.wala.util/build.gradle +++ b/com.ibm.wala.util/build.gradle @@ -4,8 +4,8 @@ eclipse.project.natures 'org.eclipse.pde.PluginNature' sourceSets.main.java.srcDirs = ['src'] -tasks.javadoc { - def coreCompileJava = project(':com.ibm.wala.core').tasks.compileJava +javadoc { + def coreCompileJava = project(':com.ibm.wala.core').compileJava dependsOn coreCompileJava doFirst { classpath += files(coreCompileJava)