eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

IDEA plugin: don't load dependencies transitively, since IDEA provides all necessary dependencies

Browse Source
This commit is contained in:
Alexey Andreev 2018-06-19 18:53:38 +03:00
parent dc99ead514
commit 544eb4e827
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java
View File

@ -99,7 +99,7 @@ class TeaVMBuild {
classPathEntries.clear(); classPathEntries.clear();
buildStrategy.init(); buildStrategy.init();
buildClassPath(module, new HashSet<>()); buildClassPath(module);
directoryClassPathEntries = classPathEntries.stream().filter(name -> new File(name).isDirectory()) directoryClassPathEntries = classPathEntries.stream().filter(name -> new File(name).isDirectory())
.collect(toList()); .collect(toList());
@ -471,10 +471,7 @@ class TeaVMBuild {
return null; return null;
} }
private void buildClassPath(JpsModule module, Set<JpsModule> visited) { private void buildClassPath(JpsModule module) {
if (!visited.add(module)) {
return;
}
File output = JpsJavaExtensionService.getInstance().getOutputDirectory(module, false); File output = JpsJavaExtensionService.getInstance().getOutputDirectory(module, false);
if (output != null) { if (output != null) {
classPathEntries.add(output.getPath()); classPathEntries.add(output.getPath());
@ -487,7 +484,11 @@ class TeaVMBuild {
for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) { for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) {
if (dependency instanceof JpsModuleDependency) { if (dependency instanceof JpsModuleDependency) {
JpsModuleDependency moduleDependency = (JpsModuleDependency) dependency; JpsModuleDependency moduleDependency = (JpsModuleDependency) dependency;
buildClassPath(moduleDependency.getModule(), visited); File dependencyOutput = JpsJavaExtensionService.getInstance().getOutputDirectory(
moduleDependency.getModule(), false);
if (dependencyOutput != null) {
classPathEntries.add(dependencyOutput.getPath());
}
} else if (dependency instanceof JpsLibraryDependency) { } else if (dependency instanceof JpsLibraryDependency) {
JpsLibrary library = ((JpsLibraryDependency) dependency).getLibrary(); JpsLibrary library = ((JpsLibraryDependency) dependency).getLibrary();
if (library == null) { if (library == null) {