From 04d9397a1dbf9351240dbb18177b9495fbde9661 Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Sun, 24 Dec 2017 20:03:17 -0600
Subject: [PATCH] Tweak classpath for some Javadoc build tasks

This comes up when the Javadoc comments refer to classes in other
subprojects that the corresponding Java code did not actually depend
upon.
---
 com.ibm.wala.cast/build.gradle | 8 ++++++++
 com.ibm.wala.core/build.gradle | 8 ++++++++
 com.ibm.wala.util/build.gradle | 2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/com.ibm.wala.cast/build.gradle b/com.ibm.wala.cast/build.gradle
index 9889ce23a..2081319d2 100644
--- a/com.ibm.wala.cast/build.gradle
+++ b/com.ibm.wala.cast/build.gradle
@@ -9,6 +9,14 @@ dependencies {
 	compile project(':com.ibm.wala.util')
 }
 
+tasks.javadoc {
+	dependsOn ':com.ibm.wala.cast.js:compileJava'
+
+	doFirst {
+		classpath += files(project(':com.ibm.wala.cast.js').tasks.compileJava)
+	}
+}
+
 def currentJavaHome = org.gradle.internal.jvm.Jvm.current().javaHome
 
 model {
diff --git a/com.ibm.wala.core/build.gradle b/com.ibm.wala.core/build.gradle
index d348881c8..e1d53be24 100644
--- a/com.ibm.wala.core/build.gradle
+++ b/com.ibm.wala.core/build.gradle
@@ -10,3 +10,11 @@ dependencies {
 	compile project(':com.ibm.wala.shrike')
 	compile project(':com.ibm.wala.util')
 }
+
+tasks.javadoc {
+	dependsOn ':com.ibm.wala.dalvik:compileJava'
+
+	doFirst {
+		classpath += files(project(':com.ibm.wala.dalvik').tasks.compileJava)
+	}
+}
diff --git a/com.ibm.wala.util/build.gradle b/com.ibm.wala.util/build.gradle
index ce0d1cd1d..146977c97 100644
--- a/com.ibm.wala.util/build.gradle
+++ b/com.ibm.wala.util/build.gradle
@@ -4,6 +4,6 @@ tasks.javadoc {
 	dependsOn ':com.ibm.wala.core:compileJava'
 
 	doFirst {
-		classpath += files(new File(project(':com.ibm.wala.core').buildDir, 'classes/java/main'))
+		classpath += files(project(':com.ibm.wala.core').tasks.compileJava)
 	}
 }