Skip to content

Commit 327aafc

Browse files
committed
Merge pull request #239 from Minecrell/patch-3
Update javadoc classpath to include Minecraft dependencies
2 parents c319408 + 43691e1 commit 327aafc

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.gradle.api.artifacts.result.ResolvedArtifactResult;
3838
import org.gradle.api.file.ConfigurableFileCollection;
3939
import org.gradle.api.internal.plugins.DslObject;
40+
import org.gradle.api.plugins.JavaPlugin;
4041
import org.gradle.api.plugins.JavaPluginConvention;
4142
import org.gradle.api.plugins.MavenPluginConvention;
4243
import org.gradle.api.tasks.GroovySourceSet;
@@ -46,6 +47,7 @@
4647
import org.gradle.api.tasks.bundling.Jar;
4748
import org.gradle.api.tasks.compile.GroovyCompile;
4849
import org.gradle.api.tasks.compile.JavaCompile;
50+
import org.gradle.api.tasks.javadoc.Javadoc;
4951
import org.gradle.api.tasks.scala.ScalaCompile;
5052
import org.gradle.jvm.JvmLibrary;
5153
import org.gradle.language.base.artifact.SourcesArtifact;
@@ -485,6 +487,9 @@ protected void configureCompilation()
485487
project.getConfigurations().getByName("apiCompile").extendsFrom(project.getConfigurations().getByName("compile"));
486488
project.getConfigurations().getByName("testCompile").extendsFrom(project.getConfigurations().getByName("apiCompile"));
487489

490+
Javadoc javadoc = (Javadoc) project.getTasks().getByName(JavaPlugin.JAVADOC_TASK_NAME);
491+
javadoc.setClasspath(main.getOutput().plus(main.getCompileClasspath()));
492+
488493
// set the compile target
489494
javaConv.setSourceCompatibility("1.6");
490495
javaConv.setTargetCompatibility("1.6");

0 commit comments

Comments
 (0)