diff --git a/Ghidra/Features/GhidraServer/data/serial.filter b/Ghidra/Features/GhidraServer/data/serial.filter index 99022f5455..711e2a6c6b 100644 --- a/Ghidra/Features/GhidraServer/data/serial.filter +++ b/Ghidra/Features/GhidraServer/data/serial.filter @@ -39,6 +39,7 @@ sun.security.x509.X509CertImpl; java.rmi.server.UID; java.rmi.server.ObjID; +[Ljava.rmi.server.ObjID; java.rmi.dgc.DGC; java.rmi.dgc.Lease; diff --git a/build.gradle b/build.gradle index f30dba4f12..b45a63732c 100644 --- a/build.gradle +++ b/build.gradle @@ -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)