Skip to content

Commit c3ac8c5

Browse files
committed
added libs folder scanning, fixes #269
1 parent c1db4a3 commit c3ac8c5

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,13 +481,16 @@ protected void configureCompilation()
481481
.plus(project.getConfigurations().getByName(CONFIG_MC))
482482
.plus(project.getConfigurations().getByName(CONFIG_MC_DEPS)));
483483

484-
project.getConfigurations().getByName("compile").extendsFrom(project.getConfigurations().getByName(CONFIG_DC_RESOLVED));
484+
project.getConfigurations().getByName(JavaPlugin.COMPILE_CONFIGURATION_NAME).extendsFrom(project.getConfigurations().getByName(CONFIG_DC_RESOLVED));
485485
project.getConfigurations().getByName(CONFIG_PROVIDED).extendsFrom(project.getConfigurations().getByName(CONFIG_DP_RESOLVED));
486-
project.getConfigurations().getByName("apiCompile").extendsFrom(project.getConfigurations().getByName("compile"));
487-
project.getConfigurations().getByName("testCompile").extendsFrom(project.getConfigurations().getByName("apiCompile"));
486+
project.getConfigurations().getByName(api.getCompileConfigurationName()).extendsFrom(project.getConfigurations().getByName("compile"));
487+
project.getConfigurations().getByName(JavaPlugin.TEST_COMPILE_CONFIGURATION_NAME).extendsFrom(project.getConfigurations().getByName("apiCompile"));
488488

489489
Javadoc javadoc = (Javadoc) project.getTasks().getByName(JavaPlugin.JAVADOC_TASK_NAME);
490490
javadoc.setClasspath(main.getOutput().plus(main.getCompileClasspath()));
491+
492+
// libs folder dependencies
493+
project.getDependencies().add(JavaPlugin.COMPILE_CONFIGURATION_NAME, project.fileTree("libs"));
491494

492495
// set the compile target
493496
javaConv.setSourceCompatibility("1.6");

0 commit comments

Comments
 (0)