GP-4685: Fixing Gradle warnings

gradle/debugger/hasExecutableJar.gradle

@@ -18,7 +18,7 @@ apply from: "$rootProject.projectDir/gradle/debugger/hasNodepJar.gradle"
 
 task executableJar {
 	ext.execsh = file("src/main/sh/execjar.sh")
-	ext.jarfile = file(nodepJar.archivePath)
+	ext.jarfile = nodepJar.archiveFile
 	ext.outjar = file("${buildDir}/bin/run")
 	dependsOn(nodepJar)
 	inputs.file { execsh }

gradle/debugger/hasNodepJar.gradle

@@ -50,12 +50,12 @@ task configureNodepJar {
 }
 
 task nodepJar(type: Jar) {
-	inputs.file(file(jar.archivePath))
+	inputs.file(jar.archiveFile)
 	dependsOn(configureNodepJar)
 	dependsOn(jar)
 
 	archiveAppendix = 'nodep'
 
-	from(zipTree(jar.archivePath))
+	from(zipTree(jar.archiveFile))
 	duplicatesStrategy = 'exclude'
 }

gradle/javaProject.gradle

@@ -55,7 +55,7 @@ processTestResources {
 	duplicatesStrategy = 'exclude'
 }
 	
-plugins.withId('java') {
+java {
 	sourceCompatibility = "${rootProject.JAVA_COMPILER}"
 	targetCompatibility = "${rootProject.JAVA_COMPILER}"
 }

gradle/javaTestProject.gradle

@@ -95,17 +95,17 @@ task pcodeTest (type: Test) { t ->
 }
 
 rootProject.unitTestReport {
-	reportOn this.project.test
+	testResults.from(this.project.test)
 }
 rootProject.integrationTestReport {
-	reportOn this.project.integrationTest
+	testResults.from(this.project.integrationTest)
 }
 rootProject.pcodeTestReport {
-	reportOn this.project.pcodeTest
+	testResults.from(this.project.pcodeTest)
 }
 rootProject.combinedTestReport { 
-	reportOn this.project.test
-	reportOn this.project.integrationTest
+	testResults.from(this.project.test)
+	testResults.from(this.project.integrationTest)
 }
 
 

gradle/root/jacoco.gradle

@@ -89,7 +89,7 @@ task jacocoReport(type: JacocoReport, group: 'Coverage reports') {
    reports {
       html {
          required
-         destination new File(rootDir.absolutePath + "/jacocoReport")
+         outputLocation = new File(rootDir.absolutePath + "/jacocoReport")
       }
       xml { }
    }

gradle/root/test.gradle

@@ -369,7 +369,7 @@ def initTestJVM(Task task, String rootDirName) {
 *********************************************************************************/
 task parallelCombinedTestReport(type: TestReport) { t ->
 		group "test"
-		destinationDir = file("$reportDir")
+		destinationDirectory = file("$reportDir")
 		logger.debug("parallelCombinedTestReport: Using destinationDir = $reportDir")
 		dependsOn ":deleteTestTempAndReportDirs"
 		mustRunAfter ":deleteTestTempAndReportDirs"
@@ -385,7 +385,7 @@ task parallelCombinedTestReport(type: TestReport) { t ->
 task unitTestReport(type: TestReport) { t ->
 	group "test"
     description "Run unit tests and save HTML report."
-    destinationDir = file("$reportDir/unitTests")
+    destinationDirectory = file("$reportDir/unitTests")
 	outputs.upToDateWhen {false}
 }
 
@@ -398,7 +398,7 @@ task unitTestReport(type: TestReport) { t ->
 task integrationTestReport(type: TestReport) { t ->
 	group "test"
     description "Run integration tests and save HTML report."
-    destinationDir = file("$reportDir/integrationTests")
+    destinationDirectory = file("$reportDir/integrationTests")
 	outputs.upToDateWhen {false}
 }
 
@@ -416,7 +416,7 @@ task integrationTestReport(type: TestReport) { t ->
 task targetedTestReport(type: TestReport) { t -> 
     group "test"
     description "Run unit tests against a specific set of projects."
-    destinationDir = file("$reportDir/unitTests")
+    destinationDirectory = file("$reportDir/unitTests")
     outputs.upToDateWhen {false}
     dependsOn ":deleteTestTempAndReportDirs"
 
@@ -560,7 +560,7 @@ configure(subprojects.findAll {parallelMode == true}) { subproject ->
  *********************************************************************************/
 task combinedTestReport(type: TestReport) { t ->
 	group "test"
-	destinationDir = file("$reportDir")
+	destinationDirectory = file("$reportDir")
 
 	dependsOn ":deleteTestTempAndReportDirs"
 	mustRunAfter ":deleteTestTempAndReportDirs"
@@ -574,7 +574,7 @@ task combinedTestReport(type: TestReport) { t ->
  *********************************************************************************/
 task pcodeTestReport(type: TestReport) { t ->
 	group "pcodeTest"
-	destinationDir = file("$pcodeTestShareDir" + "/reports")
+	destinationDirectory = file("$pcodeTestShareDir" + "/reports")
 }	
 	
 /*********************************************************************************