diff --git a/com.ibm.wala.cast.java.ecj/build.gradle b/com.ibm.wala.cast.java.ecj/build.gradle index 58e35d020..6fada8c19 100644 --- a/com.ibm.wala.cast.java.ecj/build.gradle +++ b/com.ibm.wala.cast.java.ecj/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'src' +sourceSets.main.java.srcDirs = ['src'] dependencies { compile 'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50' diff --git a/com.ibm.wala.cast.java.test.data/build.gradle b/com.ibm.wala.cast.java.test.data/build.gradle index 3cca1be44..7f8401357 100644 --- a/com.ibm.wala.cast.java.test.data/build.gradle +++ b/com.ibm.wala.cast.java.test.data/build.gradle @@ -3,7 +3,7 @@ plugins { id 'de.undercouch.download' version '3.3.0' } -sourceSets.test.java.srcDir 'src' +sourceSets.test.java.srcDirs = ['src'] //////////////////////////////////////////////////////////////////////// diff --git a/com.ibm.wala.cast.java.test/build.gradle b/com.ibm.wala.cast.java.test/build.gradle index ca9e41399..9c5ac00d6 100644 --- a/com.ibm.wala.cast.java.test/build.gradle +++ b/com.ibm.wala.cast.java.test/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.github.hauner.jarTest' version '1.0.1' } -sourceSets.test.java.srcDir 'src' +sourceSets.test.java.srcDirs = ['src'] dependencies { testCompile 'junit:junit:4.11' diff --git a/com.ibm.wala.cast.java/build.gradle b/com.ibm.wala.cast.java/build.gradle index 0c79f5f01..89a920d5e 100644 --- a/com.ibm.wala.cast.java/build.gradle +++ b/com.ibm.wala.cast.java/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'src' +sourceSets.main.java.srcDirs = ['src'] dependencies { compile project(':com.ibm.wala.cast') diff --git a/com.ibm.wala.cast.js.html.nu_validator/build.gradle b/com.ibm.wala.cast.js.html.nu_validator/build.gradle index 94a0e7885..55a27cf29 100644 --- a/com.ibm.wala.cast.js.html.nu_validator/build.gradle +++ b/com.ibm.wala.cast.js.html.nu_validator/build.gradle @@ -1,8 +1,8 @@ sourceSets { - main.java.srcDir 'src' + main.java.srcDirs = ['src'] test { - java.srcDir 'tests' - resources.srcDir project(':com.ibm.wala.cast.js.test.data').file('examples-src') + java.srcDirs = ['tests'] + resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')] } } diff --git a/com.ibm.wala.cast.js.nodejs.test/build.gradle b/com.ibm.wala.cast.js.nodejs.test/build.gradle index 412a10419..138c33241 100644 --- a/com.ibm.wala.cast.js.nodejs.test/build.gradle +++ b/com.ibm.wala.cast.js.nodejs.test/build.gradle @@ -1,6 +1,6 @@ sourceSets.test { - java.srcDir 'src' - resources.srcDir 'testdata' + java.srcDirs = ['src'] + resources.srcDirs = ['testdata'] } dependencies { diff --git a/com.ibm.wala.cast.js.nodejs/build.gradle b/com.ibm.wala.cast.js.nodejs/build.gradle index b0ef4226a..bb063b61f 100644 --- a/com.ibm.wala.cast.js.nodejs/build.gradle +++ b/com.ibm.wala.cast.js.nodejs/build.gradle @@ -1,6 +1,6 @@ sourceSets.main { - java.srcDir 'src' - resources.srcDir 'dat' + java.srcDirs = ['src'] + resources.srcDirs = ['dat'] } dependencies { diff --git a/com.ibm.wala.cast.js.rhino.test/build.gradle b/com.ibm.wala.cast.js.rhino.test/build.gradle index f5a43f851..b9f43c466 100644 --- a/com.ibm.wala.cast.js.rhino.test/build.gradle +++ b/com.ibm.wala.cast.js.rhino.test/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.github.hauner.jarTest' version '1.0.1' } -sourceSets.test.java.srcDir 'harness-src' +sourceSets.test.java.srcDirs = ['harness-src'] dependencies { testCompile 'junit:junit:4.11' diff --git a/com.ibm.wala.cast.js.rhino/build.gradle b/com.ibm.wala.cast.js.rhino/build.gradle index 9583f471b..ce61c9258 100644 --- a/com.ibm.wala.cast.js.rhino/build.gradle +++ b/com.ibm.wala.cast.js.rhino/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'source' +sourceSets.main.java.srcDirs = ['source'] dependencies { compile 'org.mozilla:rhino:1.7.7.1' diff --git a/com.ibm.wala.cast.js.test/build.gradle b/com.ibm.wala.cast.js.test/build.gradle index 90e235e53..5872bc422 100644 --- a/com.ibm.wala.cast.js.test/build.gradle +++ b/com.ibm.wala.cast.js.test/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.github.hauner.jarTest' version '1.0.1' } -sourceSets.test.java.srcDir 'harness-src' +sourceSets.test.java.srcDirs = ['harness-src'] dependencies { testCompile 'junit:junit:4.11' diff --git a/com.ibm.wala.cast.js/build.gradle b/com.ibm.wala.cast.js/build.gradle index 1db2f4a0f..919ef31a1 100644 --- a/com.ibm.wala.cast.js/build.gradle +++ b/com.ibm.wala.cast.js/build.gradle @@ -1,6 +1,6 @@ sourceSets.main { - java.srcDir 'source' - resources.srcDir 'dat' + java.srcDirs = ['source'] + resources.srcDirs = ['dat'] } dependencies { diff --git a/com.ibm.wala.cast.test/build.gradle b/com.ibm.wala.cast.test/build.gradle index 6d037db6a..a73f78504 100644 --- a/com.ibm.wala.cast.test/build.gradle +++ b/com.ibm.wala.cast.test/build.gradle @@ -4,7 +4,7 @@ plugins { apply plugin: 'cpp' -sourceSets.test.java.srcDir 'harness-src/java' +sourceSets.test.java.srcDirs = ['harness-src/java'] dependencies { testCompile 'junit:junit:4.11' @@ -46,7 +46,7 @@ model { xlator_test(NativeLibrarySpec) { sources.cpp { source { - srcDir 'harness-src/c' + srcDirs = ['harness-src/c'] include 'smoke.cpp' } generatedBy tasks.generateJniHeaders @@ -69,7 +69,7 @@ model { smoke_main(NativeExecutableSpec) { sources.cpp { source { - srcDir 'harness-src/c' + srcDirs = ['harness-src/c'] include 'smoke_main.cpp' } ['cast', 'jdk'].each { diff --git a/com.ibm.wala.cast/build.gradle b/com.ibm.wala.cast/build.gradle index 2081319d2..4ea9760e4 100644 --- a/com.ibm.wala.cast/build.gradle +++ b/com.ibm.wala.cast/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'cpp' -sourceSets.main.java.srcDir 'source/java' +sourceSets.main.java.srcDirs = ['source/java'] dependencies { compile 'commons-io:commons-io:2.4' @@ -38,10 +38,10 @@ model { sources.cpp { def cSourceDir = 'source/c' source { - srcDir "$cSourceDir/jni" + srcDirs = ["$cSourceDir/jni"] include '*.cpp' } - exportedHeaders.srcDir "$cSourceDir/include" + exportedHeaders.srcDirs = ["$cSourceDir/include"] lib library: 'jdk' } binaries.all { diff --git a/com.ibm.wala.core.testdata/build.gradle b/com.ibm.wala.core.testdata/build.gradle index 3e87b3b2b..5e55e8617 100644 --- a/com.ibm.wala.core.testdata/build.gradle +++ b/com.ibm.wala.core.testdata/build.gradle @@ -1 +1 @@ -sourceSets.test.java.srcDir 'src' +sourceSets.test.java.srcDirs = ['src'] diff --git a/com.ibm.wala.core.tests/build.gradle b/com.ibm.wala.core.tests/build.gradle index b8947e4bf..810c3c4aa 100644 --- a/com.ibm.wala.core.tests/build.gradle +++ b/com.ibm.wala.core.tests/build.gradle @@ -3,8 +3,8 @@ plugins { } sourceSets.test { - java.srcDir 'src' - resources.srcDir 'dat' + java.srcDirs = ['src'] + resources.srcDirs = ['dat'] } dependencies { diff --git a/com.ibm.wala.core/build.gradle b/com.ibm.wala.core/build.gradle index e1d53be24..ff3ba2dbf 100644 --- a/com.ibm.wala.core/build.gradle +++ b/com.ibm.wala.core/build.gradle @@ -1,5 +1,5 @@ sourceSets.main { - java.srcDir 'src' + java.srcDirs = ['src'] resources.srcDirs = [ 'dat', 'lib', diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle index d529ea547..3987a4526 100644 --- a/com.ibm.wala.dalvik.test/build.gradle +++ b/com.ibm.wala.dalvik.test/build.gradle @@ -1,6 +1,6 @@ sourceSets.test { - java.srcDir 'source' - resources.srcDir 'data' + java.srcDirs = ['source'] + resources.srcDirs = ['data'] } dependencies { diff --git a/com.ibm.wala.dalvik/build.gradle b/com.ibm.wala.dalvik/build.gradle index f8e1280e3..4ce0472a4 100644 --- a/com.ibm.wala.dalvik/build.gradle +++ b/com.ibm.wala.dalvik/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'src' +sourceSets.main.java.srcDirs = ['src'] dependencies { compile 'org.slf4j:slf4j-api:1.7.2' diff --git a/com.ibm.wala.ide.jdt.test/build.gradle b/com.ibm.wala.ide.jdt.test/build.gradle index 91b89f859..5f80cc10a 100644 --- a/com.ibm.wala.ide.jdt.test/build.gradle +++ b/com.ibm.wala.ide.jdt.test/build.gradle @@ -1,6 +1,6 @@ sourceSets.test { - java.srcDir 'source' - resources.srcDir 'testdata' + java.srcDirs = ['source'] + resources.srcDirs = ['testdata'] } dependencies { diff --git a/com.ibm.wala.ide.jdt/build.gradle b/com.ibm.wala.ide.jdt/build.gradle index 90a64fb79..19367c6eb 100644 --- a/com.ibm.wala.ide.jdt/build.gradle +++ b/com.ibm.wala.ide.jdt/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'source' +sourceSets.main.java.srcDirs = ['source'] dependencies { compile 'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50' diff --git a/com.ibm.wala.ide.jsdt.tests/build.gradle b/com.ibm.wala.ide.jsdt.tests/build.gradle index 6cac0c8f3..1b587d28d 100644 --- a/com.ibm.wala.ide.jsdt.tests/build.gradle +++ b/com.ibm.wala.ide.jsdt.tests/build.gradle @@ -1,4 +1,4 @@ -sourceSets.test.java.srcDir 'src' +sourceSets.test.java.srcDirs = ['src'] dependencies { testCompile 'junit:junit:4.11' diff --git a/com.ibm.wala.ide.jsdt/build.gradle b/com.ibm.wala.ide.jsdt/build.gradle index e7d993190..ab3b5996b 100644 --- a/com.ibm.wala.ide.jsdt/build.gradle +++ b/com.ibm.wala.ide.jsdt/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'source' +sourceSets.main.java.srcDirs = ['source'] dependencies { compile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214' diff --git a/com.ibm.wala.ide.tests/build.gradle b/com.ibm.wala.ide.tests/build.gradle index 905ed5367..ffc1df546 100644 --- a/com.ibm.wala.ide.tests/build.gradle +++ b/com.ibm.wala.ide.tests/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.github.hauner.jarTest' version '1.0.1' } -sourceSets.test.java.srcDir 'src' +sourceSets.test.java.srcDirs = ['src'] dependencies { testCompile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214' diff --git a/com.ibm.wala.ide/build.gradle b/com.ibm.wala.ide/build.gradle index 198cdf09e..9af49627a 100644 --- a/com.ibm.wala.ide/build.gradle +++ b/com.ibm.wala.ide/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'src' +sourceSets.main.java.srcDirs = ['src'] dependencies { compile 'org.eclipse.pde:org.eclipse.pde.core:3.11.1' diff --git a/com.ibm.wala.scandroid/build.gradle b/com.ibm.wala.scandroid/build.gradle index 44cbef9b0..910177573 100644 --- a/com.ibm.wala.scandroid/build.gradle +++ b/com.ibm.wala.scandroid/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'source' +sourceSets.main.java.srcDirs = ['source'] dependencies { compile 'com.google.guava:guava:18.0' diff --git a/com.ibm.wala.shrike/build.gradle b/com.ibm.wala.shrike/build.gradle index 09e9c2ff4..6e9851bad 100644 --- a/com.ibm.wala.shrike/build.gradle +++ b/com.ibm.wala.shrike/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'src' +sourceSets.main.java.srcDirs = ['src'] dependencies { compile project(':com.ibm.wala.util') diff --git a/com.ibm.wala.util/build.gradle b/com.ibm.wala.util/build.gradle index a80552646..f510516b4 100644 --- a/com.ibm.wala.util/build.gradle +++ b/com.ibm.wala.util/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDir 'src' +sourceSets.main.java.srcDirs = ['src'] tasks.javadoc { def coreCompileJava = project(':com.ibm.wala.core').tasks.compileJava