Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-28 07:55:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix several Gradle 8.x compatibility issues

Browse Source 
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:
endrin
2023-02-17 20:01:37 +02:00
committed by Ryan Kurtz
parent 4816cb3e2f
commit 69f6dae46f
3 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Decompiler/build.gradle
+6 -6
View File
@@ -157,10 +157,10 @@ task buildDecompilerHelpHtml(type: Exec) {
// Print the output of the commands and check the return value.
doLast {
println output()
if (execResult.exitValue) {
if (executionResult.get().getExitValue()) {
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(' ')}'" +
" 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.
doLast {
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 "Skipping task $it.name\n"
}
@@ -284,7 +284,7 @@ task buildDecompilerDocumentationPdfs(type: Exec) {
// Print the output of the commands and check the return value.
doLast {
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 "Skipping task $it.name\n"
}
@@ -370,11 +370,11 @@ task buildDecompilerDocumentationHtml(type: Exec) {
// Print the output of the commands and check the return value.
doLast {
println output()
if (execResult.exitValue) {
if (executionResult.get().getExitValue()) {
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(' ')}'" +
"\nfailed with exit code $execResult.exitValue; see task output for details." )
"\nfailed with exit code ${executionResult.get().getExitValue()}; see task output for details." )
)
}
}