Merge pull request #325 from liblit/miscellaneous-ide-updates

Miscellaneous IDE updates

build.gradle

@@ -57,7 +57,6 @@ version '1.5.0-SNAPSHOT'
 subprojects { subproject ->
 	// skip generic Java setup for the few projects that have no Java code whatsoever
 	switch (subproject.name) {
-		case 'com.ibm.wala.cast.js.test.data':
 		case 'com.ibm.wala-repository':
 		case ~/.*_feature/:
 			return
@@ -79,6 +78,7 @@ subprojects { subproject ->
 	jar.manifest.from('META-INF/MANIFEST.MF')
 
 	task afterEclipseBuildshipImport(dependsOn: processTestResources)
+	task afterIntelliJIDEAOpen
 
 	test {
 		include '**/*Test.class'

com.ibm.wala.cast.js.html.nu_validator/build.gradle

@@ -1,9 +1,6 @@
 sourceSets {
 	main.java.srcDirs = ['src']
-	test {
-		java.srcDirs = ['tests']
-		resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')]
-	}
+	test.java.srcDirs = ['tests']
 }
 
 dependencies {
@@ -21,6 +18,12 @@ dependencies {
 		)
 }
 
+processTestResources {
+	def data = project(':com.ibm.wala.cast.js.test.data')
+	dependsOn data.processTestResources
+	from data.sourceSets.test.resources
+}
+
 test {
 	maxHeapSize = '800M'
 }

com.ibm.wala.cast.js.rhino.test/build.gradle

@@ -2,10 +2,7 @@ plugins {
 	id 'com.github.hauner.jarTest'
 }
 
-sourceSets.test {
-	java.srcDirs = ['harness-src']
-	resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')]
-}
+sourceSets.test.java.srcDirs = ['harness-src']
 
 dependencies {
 	testCompile(
@@ -22,6 +19,12 @@ dependencies {
 		)
 }
 
+processTestResources {
+	def data = project(':com.ibm.wala.cast.js.test.data')
+	dependsOn data.processTestResources
+	from data.sourceSets.test.resources
+}
+
 test {
 	environment 'TRAVIS', 1
 	maxHeapSize = '800M'

com.ibm.wala.cast.js.test.data/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.source=1.8

com.ibm.wala.cast.js.test.data/build.gradle

@@ -1,6 +1,4 @@
-plugins {
-	id 'base'
-}
+sourceSets.test.resources.srcDirs = ['examples-src']
 
 task downloadAjaxslt(type: VerifiedDownload) {
 	def version = '0.8.1'
@@ -21,3 +19,5 @@ task unpackAjaxslt(type: Sync, dependsOn: downloadAjaxslt) {
 }
 
 clean.dependsOn cleanUnpackAjaxslt
+
+processTestResources.dependsOn(unpackAjaxslt)

com.ibm.wala.cast.js.test/build.gradle

@@ -2,10 +2,7 @@ plugins {
 	id 'com.github.hauner.jarTest'
 }
 
-sourceSets.test {
-	java.srcDirs = ['harness-src']
-	resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')]
-}
+sourceSets.test.java.srcDirs = ['harness-src']
 
 dependencies {
 	testCompile(
@@ -21,7 +18,11 @@ dependencies {
 		)
 }
 
-processTestResources.dependsOn ':com.ibm.wala.cast.js.test.data:unpackAjaxslt'
+processTestResources {
+	def data = project(':com.ibm.wala.cast.js.test.data')
+	dependsOn data.processTestResources
+	from data.sourceSets.test.resources
+}
 
 test {
 	maxHeapSize = '800M'

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

@@ -6,6 +6,7 @@ plugins {
 }
 
 eclipse.project.natures 'org.eclipse.pde.PluginNature'
+afterIntelliJIDEAOpen.dependsOn jarTest
 
 sourceSets.test.java.srcDirs = ['harness-src/java']
 

com.ibm.wala.dalvik.test/build.gradle

@@ -93,6 +93,7 @@ clean.dependsOn cleanCopyDxJar
 
 compileTestJava.dependsOn copyDxJar
 afterEclipseBuildshipImport.dependsOn copyDxJar
+afterIntelliJIDEAOpen.dependsOn copyDxJar
 
 task copyAndroidJar(type: Sync, dependsOn: installAndroidSdk) {
 	from "${installAndroidSdk.destinationDir}/platforms/${installAndroidSdk.components['platforms']}/android.jar"