Fixes handling dependencies with multiple output folders

Author: Kordyjan

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/utils/ProjectUtils.kt

@@ -77,9 +77,22 @@ object ProjectUtils {
     }
 
     @JvmStatic
-    fun getOutputFolder(javaProject: IJavaProject): IFolder? =
+    fun getDefaultOutputFolder(javaProject: IJavaProject): IFolder? =
         ResourcesPlugin.getWorkspace().root.findMember(javaProject.outputLocation) as? IFolder
 
+    @JvmStatic
+    fun getAllOutputFolders(javaProject: IJavaProject): List<IFolder> =
+            javaProject.getResolvedClasspath(true)
+                .asSequence()
+                .filter { it.entryKind == IClasspathEntry.CPE_SOURCE }
+                .map { it.outputLocation }
+                .let { it + javaProject.outputLocation }
+                .filterNotNull()
+                .distinct()
+                .mapNotNull { ResourcesPlugin.getWorkspace().root.findMember(it) as? IFolder }
+                .filter { it.exists() }
+                .toList()
+
     fun getSourceFiles(project: IProject): List<KtFile> =
         KotlinPsiManager.getFilesByProject(project)
             .map { KotlinPsiManager.getParsedFile(it) }
@@ -164,10 +177,9 @@ object ProjectUtils {
         }
 
         if (includeBinFolders) {
-            val outputFolder = ProjectUtils.getOutputFolder(javaProject)
-            if (outputFolder != null && outputFolder.exists()) {
-                orderedFiles.add(outputFolder.location.toFile())
-            }
+            getAllOutputFolders(javaProject)
+                .map { it.location.toFile() }
+                .toCollection(orderedFiles)
         }
 
         return orderedFiles.toList()

kotlin-eclipse-test-framework/src/org/jetbrains/kotlin/testframework/utils/TestJavaProject.java

@@ -234,7 +234,7 @@ public void clean() {
         try {
             cleanSourceFolder();
 
-            IFolder outputFolder = ProjectUtils.getOutputFolder(getJavaProject());
+            IFolder outputFolder = ProjectUtils.getDefaultOutputFolder(getJavaProject());
             ProjectUtils.cleanFolder(outputFolder);
             ProjectUtils.cleanFolder(KotlinJavaManager.INSTANCE.getKotlinBinFolderFor(project));
         } catch (JavaModelException e) {