Gradle 2.1 fixes

Chavdar Botev · Chavdar Botev · commit 88b8d6e7dfee · 2014-10-31T07:39:45.000-07:00
diff --git a/databus-core/databus-core-impl/build.gradle b/databus-core/databus-core-impl/build.gradle
@@ -24,6 +24,6 @@ dependencies {
 
 test {
   useTestNG()
-  testDataDirName = projectDir.absolutePath + "/test_data"
-  systemProperties.put('test.datadir', "${testDataDirName}")
+  ext.testDataDirName = projectDir.absolutePath + "/test_data"
+  systemProperties.put('test.datadir', "${ext.testDataDirName}")
 }
diff --git a/databus2-relay/databus2-relay-impl/build.gradle b/databus2-relay/databus2-relay-impl/build.gradle
@@ -32,8 +32,8 @@ dependencies {
 }
 
 test {
-  ggTestDataDirName = projectDir.absolutePath + "/src/test/TestData"
-  systemProperties.put('test.ggTestDataDir', "${ggTestDataDirName}")
+  ext.ggTestDataDirName = projectDir.absolutePath + "/src/test/TestData"
+  systemProperties.put('test.ggTestDataDir', "${ext.ggTestDataDirName}")
 }
 test.useTestNG()
 test.workingDir = "${project.rootDir}"
diff --git a/subprojects.gradle b/subprojects.gradle
@@ -57,7 +57,7 @@ if (isDefaultEnvironment) {
   externalDependency['log4j'] = 'org.slf4j:slf4j-log4j12:1.6.1'
 }
 
-tasks.withType(Compile).all { Compile compile ->
+tasks.withType(JavaCompile).all { JavaCompile compile ->
   compile.options.compilerArgs = ['-Xlint', '-Xlint:-path']
 }
 /* workaround for GRADLE-2243 (http://issues.gradle.org/browse/GRADLE-2243) */

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ dependencies {`
`24`	`24`
`25`	`25`	`test {`
`26`	`26`	`useTestNG()`
`27`		`- testDataDirName = projectDir.absolutePath + "/test_data"`
`28`		`- systemProperties.put('test.datadir', "${testDataDirName}")`
	`27`	`+ ext.testDataDirName = projectDir.absolutePath + "/test_data"`
	`28`	`+ systemProperties.put('test.datadir', "${ext.testDataDirName}")`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ dependencies {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`test {`
`35`		`- ggTestDataDirName = projectDir.absolutePath + "/src/test/TestData"`
`36`		`- systemProperties.put('test.ggTestDataDir', "${ggTestDataDirName}")`
	`35`	`+ ext.ggTestDataDirName = projectDir.absolutePath + "/src/test/TestData"`
	`36`	`+ systemProperties.put('test.ggTestDataDir', "${ext.ggTestDataDirName}")`
`37`	`37`	`}`
`38`	`38`	`test.useTestNG()`
`39`	`39`	`test.workingDir = "${project.rootDir}"`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ if (isDefaultEnvironment) {`
`57`	`57`	`externalDependency['log4j'] = 'org.slf4j:slf4j-log4j12:1.6.1'`
`58`	`58`	`}`
`59`	`59`
`60`		`-tasks.withType(Compile).all { Compile compile ->`
	`60`	`+tasks.withType(JavaCompile).all { JavaCompile compile ->`
`61`	`61`	`compile.options.compilerArgs = ['-Xlint', '-Xlint:-path']`
`62`	`62`	`}`
`63`	`63`	`/* workaround for GRADLE-2243 (http://issues.gradle.org/browse/GRADLE-2243) */`