From 3ed10c90e6e97f8f1227278fb66dd331104da6b8 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Wed, 8 Jun 2016 20:23:20 -0800
Subject: [PATCH] GITHUB-240: Fix mixed compilation.

Fixes https://github.com/cbeust/kobalt/issues/240
---
 .../beust/kobalt/internal/CompilerUtils.kt    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt
index b24b1fbb..7a5053b8 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt
@@ -3,6 +3,7 @@ package com.beust.kobalt.internal
 import com.beust.kobalt.TaskResult
 import com.beust.kobalt.api.*
 import com.beust.kobalt.maven.DependencyManager
+import com.beust.kobalt.maven.dependency.FileDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.log
 import com.google.inject.Inject
@@ -69,15 +70,18 @@ class CompilerUtils @Inject constructor(val files: KFiles,
         val fullClasspath = if (isTest) dependencyManager.testDependencies(project, context)
             else dependencyManager.dependencies(project, context)
 
-        // Remove all the excluded dependencies from the classpath
-        val classpath = fullClasspath.filter {
-            ! isDependencyExcluded(it, project.excludedDependencies)
-        }
-
+        // The directory where the classes get compiled
         val buildDirectory = if (isTest) File(project.buildDirectory, KFiles.TEST_CLASSES_DIR)
-        else File(project.classesDir(context))
+            else File(project.classesDir(context))
         File(project.directory, buildDirectory.path).mkdirs()
 
+        // The classpath needs to contain $buildDirectory/classes as well so that projects that contain
+        // multiple languages can use classes compiled by the compiler run before them.
+        // We also need to remove all the excluded dependencies from the classpath
+        val classpath = fullClasspath.filter {
+                ! isDependencyExcluded(it, project.excludedDependencies)
+            } + FileDependency(buildDirectory.path)
+
         val initialSourceDirectories = ArrayList<File>(sourceDirectories)
         // Source directories from the contributors
         val contributedSourceDirs =
@@ -137,7 +141,10 @@ class CompilerUtils @Inject constructor(val files: KFiles,
             }
         }
 
-        val allSources = (sourceFiles + extraSourceFiles).distinct().filter { File(it).exists() }
+        val allSources = (sourceFiles + extraSourceFiles)
+                .map { File(it).canonicalPath }
+                .distinct()
+                .filter { File(it).exists() }
 
         // Finally, alter the info with the compiler interceptors before returning it
         val initialActionInfo = CompilerActionInfo(projectDirectory.path, classpath, allSources,