mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-22 04:05:39 +00:00
Fix several Gradle 8.x compatibility issues
Addressed the following deprecations: * [JacocoMerge task removed:](https://docs.gradle.org/current/userguide/upgrading_version_7.html#jacocomerge_task_removed) deleted jacocoMerge task, moved its inputs to jacocoReport. * [`classifier` property removed from archive tasks:](https://docs.gradle.org/current/userguide/upgrading_version_7.html#abstractarchivetask_api_cleanup) replaced `classifier` calls with `archiveClassifier.set`. * [execResult getter property removed from exec tasks:](https://docs.gradle.org/current/userguide/upgrading_version_7.html#abstractexectask_api_cleanup) replaced with `executionResult.get`.
This commit is contained in:
parent
4816cb3e2f
commit
69f6dae46f
@ -157,10 +157,10 @@ task buildDecompilerHelpHtml(type: Exec) {
|
|||||||
// Print the output of the commands and check the return value.
|
// Print the output of the commands and check the return value.
|
||||||
doLast {
|
doLast {
|
||||||
println output()
|
println output()
|
||||||
if (execResult.exitValue) {
|
if (executionResult.get().getExitValue()) {
|
||||||
logger.error("$it.name: An error occurred. Here is the output:\n" + output())
|
logger.error("$it.name: An error occurred. Here is the output:\n" + output())
|
||||||
throw new TaskExecutionException( it, new Exception("'$it.name': The command: '${commandLine.join(' ')}'" +
|
throw new TaskExecutionException( it, new Exception("'$it.name': The command: '${commandLine.join(' ')}'" +
|
||||||
" task \nfailed with exit code $execResult.exitValue; see task output for details."))
|
" task \nfailed with exit code ${executionResult.get().getExitValue()}; see task output for details."))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -214,7 +214,7 @@ task buildDecompilerHelpPdf(type: Exec) {
|
|||||||
// Print the output of the commands and check the return value.
|
// Print the output of the commands and check the return value.
|
||||||
doLast {
|
doLast {
|
||||||
println output()
|
println output()
|
||||||
if (execResult.exitValue) {
|
if (executionResult.get().getExitValue()) {
|
||||||
println "$it.name: An error occurred with this task. Here is the output:\n" + output()
|
println "$it.name: An error occurred with this task. Here is the output:\n" + output()
|
||||||
println "Skipping task $it.name\n"
|
println "Skipping task $it.name\n"
|
||||||
}
|
}
|
||||||
@ -284,7 +284,7 @@ task buildDecompilerDocumentationPdfs(type: Exec) {
|
|||||||
// Print the output of the commands and check the return value.
|
// Print the output of the commands and check the return value.
|
||||||
doLast {
|
doLast {
|
||||||
println output()
|
println output()
|
||||||
if (execResult.exitValue) {
|
if (executionResult.get().getExitValue()) {
|
||||||
println "$it.name: An error occurred with this task. Here is the output:\n" + output()
|
println "$it.name: An error occurred with this task. Here is the output:\n" + output()
|
||||||
println "Skipping task $it.name\n"
|
println "Skipping task $it.name\n"
|
||||||
}
|
}
|
||||||
@ -370,11 +370,11 @@ task buildDecompilerDocumentationHtml(type: Exec) {
|
|||||||
// Print the output of the commands and check the return value.
|
// Print the output of the commands and check the return value.
|
||||||
doLast {
|
doLast {
|
||||||
println output()
|
println output()
|
||||||
if (execResult.exitValue) {
|
if (executionResult.get().getExitValue()) {
|
||||||
logger.error("$it.name: An error occurred. Here is the output:\n" + output())
|
logger.error("$it.name: An error occurred. Here is the output:\n" + output())
|
||||||
throw new TaskExecutionException( it,
|
throw new TaskExecutionException( it,
|
||||||
new Exception( "$it.name: The command: '${commandLine.join(' ')}'" +
|
new Exception( "$it.name: The command: '${commandLine.join(' ')}'" +
|
||||||
"\nfailed with exit code $execResult.exitValue; see task output for details." )
|
"\nfailed with exit code ${executionResult.get().getExitValue()}; see task output for details." )
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -137,12 +137,12 @@ configurations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
task testJar(type: Jar) {
|
task testJar(type: Jar) {
|
||||||
classifier "test" // value part of file name
|
archiveClassifier.set("test") // value part of file name
|
||||||
from sourceSets.test.output
|
from sourceSets.test.output
|
||||||
}
|
}
|
||||||
|
|
||||||
task integrationTestJar(type: Jar) {
|
task integrationTestJar(type: Jar) {
|
||||||
classifier "integrationTest" // value part of file name
|
archiveClassifier.set("integrationTest") // value part of file name
|
||||||
from sourceSets.integrationTest.output
|
from sourceSets.integrationTest.output
|
||||||
}
|
}
|
||||||
artifacts {
|
artifacts {
|
||||||
|
@ -22,14 +22,6 @@ dependencies {
|
|||||||
jacocoAgent 'org.jacoco:org.jacoco.agent:0.8.8'
|
jacocoAgent 'org.jacoco:org.jacoco.agent:0.8.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
def String jacocoRootExecPath = "$buildDir/jacoco/jacocoMerge.exec"
|
|
||||||
|
|
||||||
delete new File(jacocoRootExecPath) // If the merged exec file (output from jacocoMerge) exists,
|
|
||||||
// jacocoReport & jacocoBranchReport tasks are skipped and
|
|
||||||
// the report is not generated.
|
|
||||||
// So always delete the merged file before the determination
|
|
||||||
// to skip a task is made.
|
|
||||||
|
|
||||||
/*********************************************************************************
|
/*********************************************************************************
|
||||||
* Generate the Jacoco excludes list from file (this will strip out comments and
|
* Generate the Jacoco excludes list from file (this will strip out comments and
|
||||||
* whitespace).
|
* whitespace).
|
||||||
@ -71,27 +63,19 @@ def shouldIgnoreLine(line) {
|
|||||||
|
|
||||||
List excludesList = generateExcludesList()
|
List excludesList = generateExcludesList()
|
||||||
|
|
||||||
/*********************************************************************************
|
|
||||||
* Task to merge multiple jacoco execution data files into one
|
|
||||||
*********************************************************************************/
|
|
||||||
task jacocoMerge(type: JacocoMerge) {
|
|
||||||
description = 'Task to merge multiple jacoco execution data files into one.'
|
|
||||||
destinationFile = new File(jacocoRootExecPath)
|
|
||||||
dependsOn { subprojects.findAll { p -> p.plugins.hasPlugin('jacoco') }.test }
|
|
||||||
dependsOn { subprojects.findAll { p -> p.plugins.hasPlugin('jacoco') }.integrationTest }
|
|
||||||
executionData fileTree(rootDir) {
|
|
||||||
include '**/*.exec'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*********************************************************************************
|
/*********************************************************************************
|
||||||
* Task to generate an aggregate jacoco report from subprojects with
|
* Task to generate an aggregate jacoco report from subprojects with
|
||||||
* Java sourceSets
|
* Java sourceSets
|
||||||
*********************************************************************************/
|
*********************************************************************************/
|
||||||
task jacocoReport(type: JacocoReport, group: 'Coverage reports') {
|
task jacocoReport(type: JacocoReport, group: 'Coverage reports') {
|
||||||
description = 'Generates an aggregate Jacoco report from all subprojects'
|
description = 'Generates an aggregate Jacoco report from all subprojects'
|
||||||
dependsOn 'jacocoMerge'
|
|
||||||
executionData new File(jacocoRootExecPath)
|
dependsOn { subprojects.findAll { p -> p.plugins.hasPlugin('jacoco') }.test }
|
||||||
|
dependsOn { subprojects.findAll { p -> p.plugins.hasPlugin('jacoco') }.integrationTest }
|
||||||
|
|
||||||
|
executionData fileTree(rootDir) {
|
||||||
|
include '**/*.exec'
|
||||||
|
}
|
||||||
|
|
||||||
// Setting these source/class dirs MUST be done in the configuration phase (we used
|
// Setting these source/class dirs MUST be done in the configuration phase (we used
|
||||||
// to do it in a doFirst block but that was deprecated in later gradle builds). However,
|
// to do it in a doFirst block but that was deprecated in later gradle builds). However,
|
||||||
|
Loading…
Reference in New Issue
Block a user