Merge remote-tracking branch 'origin/patch' into Ghidra_12.1

This commit is contained in:
Ryan Kurtz
2026-05-05 11:21:00 -04:00
2 changed files with 17 additions and 2 deletions

View File

@@ -339,6 +339,20 @@ def getCurrentDateTimeLong() {
return formattedDate
}
/*********************************************************************************
* Returns the project object from the given projectDependency
*********************************************************************************/
def getDependencyProject(p, projectDependency) {
if (projectDependency.hasProperty("path")) {
// Supported by Gradle 8.11 and later
return p.project(projectDependency.path)
}
else {
// Supported in Gradle 8.5, removed in Gradle 9
return projectDependency.dependencyProject
}
}
/*********************************************************************************
* Returns true if 'project' has a direct or transitive API project dependency
* on the project with path 'targetPath'. The 'targetPath' should be specified
@@ -355,11 +369,11 @@ boolean hasApiProjectDependency(Project project, String targetPath) {
.allDependencies
.withType(org.gradle.api.artifacts.ProjectDependency)
if (apiDeps.any { it.dependencyProject.path == targetPath }) {
if (apiDeps.any { getDependencyProject(p, it).path == targetPath }) {
return true
}
return apiDeps.any { dep -> walk(dep.dependencyProject) }
return apiDeps.any { walk(getDependencyProject(p, it)) }
}
walk(project)