From d0b29b0dabd0f999676fac4c39c1c8521ef35632 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Wed, 12 Jun 2024 10:04:40 -0400 Subject: [PATCH] GP-4685: Fixing Gradle warnings --- Ghidra/Extensions/BSimElasticPlugin/build.gradle | 6 ++++-- Ghidra/Extensions/bundle_examples/build.gradle | 2 +- GhidraBuild/BuildFiles/JsonDoclet/build.gradle | 6 ++++-- .../GhidraDev/GhidraDevPlugin/build.gradle | 6 ++++-- GhidraBuild/LaunchSupport/build.gradle | 6 ++++-- GhidraDocs/build.gradle | 6 ++++-- gradle/debugger/hasExecutableJar.gradle | 2 +- gradle/debugger/hasNodepJar.gradle | 4 ++-- gradle/javaProject.gradle | 2 +- gradle/javaTestProject.gradle | 10 +++++----- gradle/root/jacoco.gradle | 2 +- gradle/root/test.gradle | 12 ++++++------ settings.gradle | 2 -- 13 files changed, 37 insertions(+), 29 deletions(-) diff --git a/Ghidra/Extensions/BSimElasticPlugin/build.gradle b/Ghidra/Extensions/BSimElasticPlugin/build.gradle index fcce917d5d..0787e26592 100755 --- a/Ghidra/Extensions/BSimElasticPlugin/build.gradle +++ b/Ghidra/Extensions/BSimElasticPlugin/build.gradle @@ -35,10 +35,12 @@ sourceSets { // this dependency block is needed for this code to compile in our eclipse environment. It is not needed // for the gradle build dependencies { - implementation project(':BSim') } -libsDirName='ziplayout' + +base { + libsDirectory = file('ziplayout') +} task copyGenericTask(type: Copy) { from project(':Generic').file('src/main/java') diff --git a/Ghidra/Extensions/bundle_examples/build.gradle b/Ghidra/Extensions/bundle_examples/build.gradle index c996218f91..1bf09d2822 100644 --- a/Ghidra/Extensions/bundle_examples/build.gradle +++ b/Ghidra/Extensions/bundle_examples/build.gradle @@ -123,7 +123,7 @@ task zipExtensions(type: Zip, dependsOn:jarTasks) { include "scripts_*.jar" for(jarTask in jarTasks) { - from relativePath(jarTask.archivePath) + from relativePath(jarTask.archiveFile.getAsFile()) exclude jarTask.dirName } diff --git a/GhidraBuild/BuildFiles/JsonDoclet/build.gradle b/GhidraBuild/BuildFiles/JsonDoclet/build.gradle index 757635c9c7..707bc040f8 100644 --- a/GhidraBuild/BuildFiles/JsonDoclet/build.gradle +++ b/GhidraBuild/BuildFiles/JsonDoclet/build.gradle @@ -18,8 +18,10 @@ eclipse.project.name = '_JsonDoclet' apply plugin: 'java-library' -sourceCompatibility = "${rootProject.JAVA_COMPILER}" -targetCompatibility = "${rootProject.JAVA_COMPILER}" +java { + sourceCompatibility = "${rootProject.JAVA_COMPILER}" + targetCompatibility = "${rootProject.JAVA_COMPILER}" +} dependencies { api "com.google.code.gson:gson:2.9.0" diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle index fb0be7b292..ef5a4bf98f 100644 --- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle +++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle @@ -15,8 +15,10 @@ */ apply plugin: 'java-library' -sourceCompatibility = "${rootProject.JAVA_COMPILER}" -targetCompatibility = "${rootProject.JAVA_COMPILER}" +java { + sourceCompatibility = "${rootProject.JAVA_COMPILER}" + targetCompatibility = "${rootProject.JAVA_COMPILER}" +} //This project requires the eclpse PDE plugin. To create eclipse files for this project, run // "gradle eclipse -PeclipsePDE" diff --git a/GhidraBuild/LaunchSupport/build.gradle b/GhidraBuild/LaunchSupport/build.gradle index 5c16b4c765..a8bc0b5f20 100644 --- a/GhidraBuild/LaunchSupport/build.gradle +++ b/GhidraBuild/LaunchSupport/build.gradle @@ -19,8 +19,10 @@ eclipse.project.name = '_LaunchSupport' // This should run in the oldest version of Java possible to maximize the odds of it running on a // user's system. -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} jar { manifest { diff --git a/GhidraDocs/build.gradle b/GhidraDocs/build.gradle index 7fe619e189..7a6427e73a 100644 --- a/GhidraDocs/build.gradle +++ b/GhidraDocs/build.gradle @@ -17,8 +17,10 @@ apply plugin: 'java-library' apply plugin: 'eclipse' eclipse.project.name = '_GhidraDocs' -sourceCompatibility = "${rootProject.JAVA_COMPILER}" -targetCompatibility = "${rootProject.JAVA_COMPILER}" +java { + sourceCompatibility = "${rootProject.JAVA_COMPILER}" + targetCompatibility = "${rootProject.JAVA_COMPILER}" +} sourceSets { ghidraClass { diff --git a/gradle/debugger/hasExecutableJar.gradle b/gradle/debugger/hasExecutableJar.gradle index bca8f24fde..6252610960 100644 --- a/gradle/debugger/hasExecutableJar.gradle +++ b/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 } diff --git a/gradle/debugger/hasNodepJar.gradle b/gradle/debugger/hasNodepJar.gradle index edaea71ad1..4824f2f189 100644 --- a/gradle/debugger/hasNodepJar.gradle +++ b/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' } diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle index 09ae0e50b7..69531fc63c 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -55,7 +55,7 @@ processTestResources { duplicatesStrategy = 'exclude' } -plugins.withId('java') { +java { sourceCompatibility = "${rootProject.JAVA_COMPILER}" targetCompatibility = "${rootProject.JAVA_COMPILER}" } diff --git a/gradle/javaTestProject.gradle b/gradle/javaTestProject.gradle index dd84ef74ed..3d3fcfe6ca 100644 --- a/gradle/javaTestProject.gradle +++ b/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) } diff --git a/gradle/root/jacoco.gradle b/gradle/root/jacoco.gradle index 9aa5bd9bab..f821464391 100644 --- a/gradle/root/jacoco.gradle +++ b/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 { } } diff --git a/gradle/root/test.gradle b/gradle/root/test.gradle index 4904535c30..0e0d1b88ca 100644 --- a/gradle/root/test.gradle +++ b/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") } /********************************************************************************* diff --git a/settings.gradle b/settings.gradle index 13335a393d..30ca74693b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -37,11 +37,9 @@ includeProject('JsonDoclet', 'GhidraBuild/BuildFiles', true) includeProject('LaunchSupport', 'GhidraBuild', true) includeProject('Skeleton', 'GhidraBuild', true) includeProject('BuildFiles', 'GhidraBuild', true) -includeProject('GhidraTest', '.', true) includeProject('decompile', 'Ghidra/Features/Decompiler/src', true) includeProject('RuntimeScripts', 'Ghidra', true) includeProject('IDAPro', 'GhidraBuild', true) -includeProject('NativeSupport', 'GhidraBuild', true) includeProject('GhidraDocs', '.', true) includeProjects('GhidraBuild/EclipsePlugins/GhidraDev') // requires Eclipse PDE includeProjects('GhidraBuild/EclipsePlugins/GhidraSleighEditor') // requires Eclipse DSL