From 15efe61a7425c6ac9b3018abb401ca5821f89928 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 2 Feb 2016 21:20:05 +0400
Subject: [PATCH 1/6] Use the suffix.

---
 .../src/main/kotlin/com/beust/kobalt/Variant.kt               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
index 3d9380d1..3b57d68c 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
@@ -56,12 +56,12 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
 
 //            // The ordering of files is: 1) build type 2) product flavor 3) default
             buildType.let {
-                val dir = File(KFiles.joinDir("src", it.name, project.projectInfo.sourceDirectory))
+                val dir = File(KFiles.joinDir("src", it.name, suffix))
                 log(3, "Adding source for build type ${it.name}: ${dir.path}")
                 result.add(dir)
             }
             productFlavor.let {
-                val dir = File(KFiles.joinDir("src", it.name, project.projectInfo.sourceDirectory))
+                val dir = File(KFiles.joinDir("src", it.name, suffix))
                 log(3, "Adding source for product flavor ${it.name}: ${dir.path}")
                 result.add(dir)
             }

From 93415868b07ff855cb2ef284498da20ccb05b38a Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 2 Feb 2016 21:30:29 +0400
Subject: [PATCH 2/6] Refactoring toward mixed mode.

---
 .../src/main/kotlin/com/beust/kobalt/Variant.kt       |  5 +++--
 .../kotlin/com/beust/kobalt/internal/ProjectInfo.kt   | 11 ++++++++---
 .../kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt |  2 +-
 .../com/beust/kobalt/plugin/java/JavaProjectInfo.kt   |  4 ++--
 .../com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt    |  2 +-
 .../beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt   |  4 ++--
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
index 3b57d68c..12a2c01b 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
@@ -36,8 +36,9 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
 
     fun resDirectories(project: Project) : List<File> = sourceDirectories(project, "res")
 
-    fun sourceDirectories(project: Project) : List<File> =
-            sourceDirectories(project, project.projectInfo.sourceDirectory)
+    fun sourceDirectories(project: Project) = project.projectInfo.sourceSuffixes.flatMap {
+            sourceDirectories(project, it)
+        }
 
     /**
      * suffix is either "java" (to find source files) or "res" (to find resources)
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt
index 300be5a2..81971559 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt
@@ -7,12 +7,15 @@ import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import java.util.*
 
+class LanguageInfo(val name: String, val suffix : String = name)
+
 /**
  * Data that is useful for projects to have but should not be specified in the DSL.
  */
 interface IProjectInfo {
-    /** Used to determine the last directory segment of the flavored sources, e.g. src/main/JAVA */
-    val sourceDirectory : String
+    val languageInfos: List<LanguageInfo>
+
+    val sourceSuffixes: List<String>
 
     val defaultSourceDirectories: HashSet<String>
     val defaultTestDirectories: HashSet<String>
@@ -37,9 +40,11 @@ interface IProjectInfo {
     fun dependsOnDirtyProjects(project: Project) = project.projectInfo.dependsOn.any { it.projectInfo.isDirty }
 }
 
-abstract class BaseProjectInfo : IProjectInfo {
+abstract class BaseProjectInfo(override val languageInfos: List<LanguageInfo>) : IProjectInfo {
     abstract fun generate(field: BuildConfigField) : String
 
+    override val sourceSuffixes = languageInfos.map { it.suffix }
+
     fun generate(type: String, name: String, value: Any) = generate(BuildConfigField(type, name, value))
 
     fun generateFieldsFromContributors(project: Project, context: KobaltContext)
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
index f3a21975..2b3b1aa1 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
@@ -37,7 +37,7 @@ class JavaPlugin @Inject constructor(
 
     // IDocContributor
     override fun affinity(project: Project, context: KobaltContext) =
-            if (project.sourceSuffix == ".java") 1 else 0
+            if (project.sourceDirectories.any { it.contains("java") }) 1 else 0
 
     override fun generateDoc(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult {
         val result =
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt
index 6084e94d..11f55760 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt
@@ -6,11 +6,11 @@ import com.beust.kobalt.api.BuildConfigField
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.internal.BaseProjectInfo
+import com.beust.kobalt.internal.LanguageInfo
 import com.google.inject.Singleton
 
 @Singleton
-class JavaProjectInfo : BaseProjectInfo() {
-    override val sourceDirectory = "java"
+class JavaProjectInfo : BaseProjectInfo(listOf(LanguageInfo("java", "java"))) {
     override val defaultSourceDirectories = hashSetOf("src/main/java", "src/main/resources", "src/main/res")
     override val defaultTestDirectories = hashSetOf("src/test/java", "src/test/resources", "src/test/res")
 
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
index 2dee776e..6158236c 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
@@ -125,7 +125,7 @@ class KotlinPlugin @Inject constructor(
     // ICompilerContributor
 
     override fun affinity(project: Project, context: KobaltContext) =
-            if (project.sourceSuffix == ".kt") 1 else 0
+            if (project.sourceDirectories.any { it.contains("kotlin") }) 2 else 0
 
     override fun compile(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult {
         val result =
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt
index ebdf70e1..9d951583 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt
@@ -6,11 +6,11 @@ import com.beust.kobalt.api.BuildConfigField
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.internal.BaseProjectInfo
+import com.beust.kobalt.internal.LanguageInfo
 import com.google.inject.Singleton
 
 @Singleton
-class KotlinProjectInfo : BaseProjectInfo() {
-    override val sourceDirectory = "kotlin"
+class KotlinProjectInfo : BaseProjectInfo(listOf(LanguageInfo("kotlin", "kt"))) {
     override val defaultSourceDirectories = hashSetOf("src/main/kotlin", "src/main/resources", "src/main/res")
     override val defaultTestDirectories = hashSetOf("src/test/kotlin", "src/test/resources", "src/test/res")
 

From b474c2de37e86802a53049a25fd6b9c1b3515a79 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 2 Feb 2016 22:58:53 +0400
Subject: [PATCH 3/6] Mixed language projects.

---
 .../main/kotlin/com/beust/kobalt/Variant.kt   | 16 ++--
 .../beust/kobalt/api/ICompilerContributor.kt  |  3 +-
 .../kotlin/com/beust/kobalt/api/Project.kt    |  1 -
 .../com/beust/kobalt/internal/ActorUtils.kt   |  7 ++
 .../kobalt/internal/JvmCompilerPlugin.kt      | 84 +++++++++----------
 .../com/beust/kobalt/internal/ProjectInfo.kt  | 10 +--
 .../beust/kobalt/plugin/java/JavaPlugin.kt    |  5 +-
 .../kobalt/plugin/java/JavaProjectInfo.kt     |  3 +-
 .../kobalt/plugin/kotlin/KotlinPlugin.kt      |  5 +-
 .../kobalt/plugin/kotlin/KotlinProjectInfo.kt |  3 +-
 .../plugin/packaging/PackagingPlugin.kt       |  2 +-
 11 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
index 12a2c01b..f6e6274c 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
@@ -1,6 +1,7 @@
 package com.beust.kobalt
 
 import com.beust.kobalt.api.*
+import com.beust.kobalt.internal.ActorUtils
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.log
 import java.io.File
@@ -34,11 +35,14 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
         return result
     }
 
-    fun resDirectories(project: Project) : List<File> = sourceDirectories(project, "res")
-
-    fun sourceDirectories(project: Project) = project.projectInfo.sourceSuffixes.flatMap {
+    fun sourceDirectories(project: Project, context: KobaltContext) : List<File> {
+        val compilers = ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors)
+        val sourceSuffixes = compilers.flatMap { it.sourceSuffixes }
+        val result = sourceSuffixes.flatMap {
             sourceDirectories(project, it)
-        }
+        }.toHashSet()
+        return result.toList()
+    }
 
     /**
      * suffix is either "java" (to find source files) or "res" (to find resources)
@@ -141,7 +145,9 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
             // that directory will be added when trying to find recursively all the sources in it
             generatedSourceDirectory = File(result.relativeTo(File(project.directory)))
             val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar))
-            val outputDir = File(outputGeneratedSourceDirectory, "BuildConfig" + project.sourceSuffix)
+            val compilers = ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors)
+            val outputDir = File(outputGeneratedSourceDirectory,
+                    "BuildConfig" + compilers[0].sourceSuffixes[0])
             KFiles.saveFile(outputDir, code)
             log(2, "Generated ${outputDir.path}")
             return result
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ICompilerContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ICompilerContributor.kt
index 1de85643..4372d1ec 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ICompilerContributor.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ICompilerContributor.kt
@@ -1,9 +1,8 @@
 package com.beust.kobalt.api
 
 import com.beust.kobalt.TaskResult
-import com.beust.kobalt.api.IClasspathDependency
-import java.io.File
 
 interface ICompilerContributor : IProjectAffinity {
+    val sourceSuffixes: List<String>
     fun compile(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult
 }
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt
index 17dca103..a01ad682 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt
@@ -16,7 +16,6 @@ open class Project(
         @Directive open var artifactId: String? = null,
         @Directive open var packaging: String? = null,
         @Directive open var dependencies: Dependencies? = null,
-        @Directive open var sourceSuffix : String = "",
         @Directive open var description : String = "",
         @Directive open var scm : Scm? = null,
         @Directive open var url: String? = null,
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ActorUtils.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ActorUtils.kt
index 6216ecfb..42aac9e2 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ActorUtils.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ActorUtils.kt
@@ -13,6 +13,13 @@ class ActorUtils {
         fun <T : IProjectAffinity> selectAffinityActor(project: Project, context: KobaltContext, actors: List<T>)
             = actors.maxBy { it.affinity(project, context) }
 
+        /**
+         * Return all the plug-in actors with a non zero affinity sorted from the highest to the lowest.
+         */
+        fun <T : IProjectAffinity> selectAffinityActors(project: Project, context: KobaltContext, actors: List<T>)
+                = actors.filter { it.affinity(project, context) > 0 }
+                        .sortedByDescending { it.affinity(project, context) }
+
         /**
          * Return the plug-in actor with the highest affinity.
          */
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
index bd74d8a2..e96d1764 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
@@ -138,34 +138,6 @@ abstract class JvmCompilerPlugin @Inject constructor(
         project.projectProperties.put(COMPILER_ARGS, arrayListOf(*args))
     }
 
-    fun isOutdated(project: Project, context: KobaltContext, actionInfo: CompilerActionInfo): Boolean {
-        fun stripSourceDir(sourceFile: String): String {
-            project.sourceDirectories.forEach {
-                val d = listOf(project.directory, it).joinToString("/")
-                if (sourceFile.startsWith(d)) return sourceFile.substring(d.length + 1)
-            }
-            throw KobaltException("Couldn't strip source dir from $sourceFile")
-        }
-
-        fun stripSuffix(sourceFile: String): String {
-            val index = sourceFile.indexOf(project.sourceSuffix)
-            if (index >= 0) return sourceFile.substring(0, index)
-            else return sourceFile
-        }
-
-        actionInfo.sourceFiles.map { it.replace("\\", "/") }.forEach { sourceFile ->
-            val stripped = stripSourceDir(sourceFile)
-            val classFile = File(KFiles.joinDir(project.directory, project.classesDir(context),
-                    toClassFile(stripSuffix(stripped))))
-            if (!classFile.exists() || File(sourceFile).lastModified() > classFile.lastModified()) {
-                log(2, "Outdated $sourceFile $classFile " + Date(File(sourceFile).lastModified()) +
-                        " " + classFile.lastModified())
-                return true
-            }
-        }
-        return false
-    }
-
     @IncrementalTask(name = JvmCompilerPlugin.TASK_COMPILE, description = "Compile the project")
     fun taskCompile(project: Project): IncrementalTaskInfo {
         val inputChecksum = Md5.toMd5Directories(project.sourceDirectories.map {
@@ -182,18 +154,32 @@ abstract class JvmCompilerPlugin @Inject constructor(
 
     private fun doTaskCompile(project: Project): TaskResult {
         // Set up the source files now that we have the variant
-        sourceDirectories.addAll(context.variant.sourceDirectories(project))
+        sourceDirectories.addAll(context.variant.sourceDirectories(project, context))
 
         val sourceDirectory = context.variant.maybeGenerateBuildConfig(project, context)
         if (sourceDirectory != null) {
             sourceDirectories.add(sourceDirectory)
         }
-        val info = createCompilerActionInfo(project, context, isTest = false)
-        val compiler = ActorUtils.selectAffinityActor(project, context, context.pluginInfo.compilerContributors)
-        if (compiler != null) {
-            return compiler.compile(project, context, info)
-        } else {
+//        val info = createCompilerActionInfo(project, context, isTest = false)
+//        val compiler = ActorUtils.selectAffinityActor(project, context, context.pluginInfo.compilerContributors)
+        val results = arrayListOf<TaskResult>()
+        val compilers = ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors)
+
+        var failedResult: TaskResult? = null
+        if (compilers.isEmpty()) {
             throw KobaltException("Couldn't find any compiler for project ${project.name}")
+        } else {
+            compilers.forEach { compiler ->
+                val info = createCompilerActionInfo(project, context, isTest = false,
+                        sourceSuffixes = compiler.sourceSuffixes)
+                val thisResult = compiler.compile(project, context, info)
+                results.add(thisResult)
+                if (! thisResult.success && failedResult == null) {
+                    failedResult = thisResult
+                }
+            }
+            return if (failedResult != null) failedResult!!
+                else results[0]
         }
     }
 
@@ -214,8 +200,13 @@ abstract class JvmCompilerPlugin @Inject constructor(
     fun taskJavadoc(project: Project): TaskResult {
         val docGenerator = ActorUtils.selectAffinityActor(project, context, context.pluginInfo.docContributors)
         if (docGenerator != null) {
-            return docGenerator.generateDoc(project, context, createCompilerActionInfo(project, context,
-                    isTest = false))
+            val compilers = ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors)
+            var result: TaskResult? = null
+            compilers.forEach { compiler ->
+                result = docGenerator.generateDoc(project, context, createCompilerActionInfo(project, context,
+                        isTest = false, sourceSuffixes =  compiler.sourceSuffixes))
+            }
+            return result!!
         } else {
             warn("Couldn't find any doc contributor for project ${project.name}")
             return TaskResult()
@@ -234,8 +225,8 @@ abstract class JvmCompilerPlugin @Inject constructor(
      * Create a CompilerActionInfo (all the information that a compiler needs to know) for the given parameters.
      * Runs all the contributors and interceptors relevant to that task.
      */
-    protected fun createCompilerActionInfo(project: Project, context: KobaltContext, isTest: Boolean):
-            CompilerActionInfo {
+    protected fun createCompilerActionInfo(project: Project, context: KobaltContext, isTest: Boolean,
+            sourceSuffixes: List<String>): CompilerActionInfo {
         copyResources(project, JvmCompilerPlugin.SOURCE_SET_MAIN)
 
         val fullClasspath = if (isTest) dependencyManager.testDependencies(project, context)
@@ -271,14 +262,23 @@ abstract class JvmCompilerPlugin @Inject constructor(
             File(project.directory, it.path).exists()
         }
 
-        // Now that we have the final list of source dirs, find source files in them
         val sourceFiles = files.findRecursively(projectDirectory, sourceDirectories,
-                { it.endsWith(project.sourceSuffix) })
+                { file -> sourceSuffixes.any { file.endsWith(it) }})
                 .map { File(projectDirectory, it).path }
 
+        // Special treatment if we are compiling Kotlin files and the project also has a java source
+        // directory. In this case, also pass that java source directory to the Kotlin compiler as is
+        // so that it can parse its symbols
+        val extraSourceFiles = arrayListOf<String>()
+        if (sourceSuffixes.any { it.contains("kt")}) {
+            project.sourceDirectories.forEach {
+                if (it.contains("java")) extraSourceFiles.add(it)
+            }
+        }
+
         // Finally, alter the info with the compiler interceptors before returning it
-        val initialActionInfo = CompilerActionInfo(projectDirectory.path, classpath, sourceFiles, buildDirectory,
-                emptyList())
+        val initialActionInfo = CompilerActionInfo(projectDirectory.path, classpath, sourceFiles + extraSourceFiles,
+                buildDirectory, emptyList())
         val result = context.pluginInfo.compilerInterceptors.fold(initialActionInfo, { ai, interceptor ->
             interceptor.intercept(project, context, ai)
         })
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt
index 81971559..093bc45e 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt
@@ -7,16 +7,10 @@ import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import java.util.*
 
-class LanguageInfo(val name: String, val suffix : String = name)
-
 /**
  * Data that is useful for projects to have but should not be specified in the DSL.
  */
 interface IProjectInfo {
-    val languageInfos: List<LanguageInfo>
-
-    val sourceSuffixes: List<String>
-
     val defaultSourceDirectories: HashSet<String>
     val defaultTestDirectories: HashSet<String>
 
@@ -40,11 +34,9 @@ interface IProjectInfo {
     fun dependsOnDirtyProjects(project: Project) = project.projectInfo.dependsOn.any { it.projectInfo.isDirty }
 }
 
-abstract class BaseProjectInfo(override val languageInfos: List<LanguageInfo>) : IProjectInfo {
+abstract class BaseProjectInfo : IProjectInfo {
     abstract fun generate(field: BuildConfigField) : String
 
-    override val sourceSuffixes = languageInfos.map { it.suffix }
-
     fun generate(type: String, name: String, value: Any) = generate(BuildConfigField(type, name, value))
 
     fun generateFieldsFromContributors(project: Project, context: KobaltContext)
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
index 2b3b1aa1..f9590864 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
@@ -52,12 +52,15 @@ class JavaPlugin @Inject constructor(
 
     override fun doTaskCompileTest(project: Project): TaskResult {
         copyResources(project, JvmCompilerPlugin.SOURCE_SET_TEST)
-        val compilerActionInfo = createCompilerActionInfo(project, context, isTest = true)
+        val compilerActionInfo = createCompilerActionInfo(project, context, isTest = true,
+                sourceSuffixes = sourceSuffixes)
         val result = javaCompiler.compile(project, context, compilerActionInfo)
         return result
     }
 
     // ICompilerContributor
+    override val sourceSuffixes = listOf("java")
+
     override fun compile(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult {
         val result =
             if (info.sourceFiles.size > 0) {
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt
index 11f55760..4f47d9ec 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt
@@ -6,11 +6,10 @@ import com.beust.kobalt.api.BuildConfigField
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.internal.BaseProjectInfo
-import com.beust.kobalt.internal.LanguageInfo
 import com.google.inject.Singleton
 
 @Singleton
-class JavaProjectInfo : BaseProjectInfo(listOf(LanguageInfo("java", "java"))) {
+class JavaProjectInfo : BaseProjectInfo() {
     override val defaultSourceDirectories = hashSetOf("src/main/java", "src/main/resources", "src/main/res")
     override val defaultTestDirectories = hashSetOf("src/test/java", "src/test/resources", "src/test/res")
 
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
index 6158236c..b0870435 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
@@ -76,8 +76,9 @@ class KotlinPlugin @Inject constructor(
         copyResources(project, JvmCompilerPlugin.SOURCE_SET_TEST)
         val projectDir = File(project.directory)
 
+
         val sourceFiles = files.findRecursively(projectDir, project.sourceDirectoriesTest.map { File(it) })
-        { it: String -> it.endsWith(project.sourceSuffix) }
+            { file: String -> sourceSuffixes.any { file.endsWith(it) } }
                 .map { File(projectDir, it).absolutePath }
 
         val result =
@@ -124,6 +125,8 @@ class KotlinPlugin @Inject constructor(
 
     // ICompilerContributor
 
+    override val sourceSuffixes = listOf("kt")
+
     override fun affinity(project: Project, context: KobaltContext) =
             if (project.sourceDirectories.any { it.contains("kotlin") }) 2 else 0
 
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt
index 9d951583..8ba851bd 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt
@@ -6,11 +6,10 @@ import com.beust.kobalt.api.BuildConfigField
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.internal.BaseProjectInfo
-import com.beust.kobalt.internal.LanguageInfo
 import com.google.inject.Singleton
 
 @Singleton
-class KotlinProjectInfo : BaseProjectInfo(listOf(LanguageInfo("kotlin", "kt"))) {
+class KotlinProjectInfo : BaseProjectInfo() {
     override val defaultSourceDirectories = hashSetOf("src/main/kotlin", "src/main/resources", "src/main/res")
     override val defaultTestDirectories = hashSetOf("src/test/kotlin", "src/test/resources", "src/test/res")
 
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
index 8121c861..96550cdd 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
@@ -276,7 +276,7 @@ class PackageConfig(val project: Project) : AttributeHolder {
         jar {
             name = "${project.name}-${project.version}-sources.jar"
             project.sourceDirectories.forEach {
-                include(from(it), to(""), glob("**${project.sourceSuffix}"))
+                include(from(it), to(""), glob("src/**"))
             }
         }
         jar {

From ddea0e191de7d70b59c62625194e990dd88741f1 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 2 Feb 2016 23:03:44 +0400
Subject: [PATCH 4/6] Tests for mixed projects.

---
 .../projects/javaFirst/kobalt/src/Build.kt    |  27 ++++++++++++++++++
 .../kobalt/wrapper/kobalt-wrapper.jar         | Bin 0 -> 7253 bytes
 .../kobalt/wrapper/kobalt-wrapper.properties  |   1 +
 src/test/resources/projects/javaFirst/kobaltw |   2 ++
 .../src/main/java/example/JavaClass.java      |   8 ++++++
 .../src/main/kotlin/example/KotlinMain.kt     |   6 ++++
 .../projects/kotlinFirst/kobalt/src/Build.kt  |  27 ++++++++++++++++++
 .../kobalt/wrapper/kobalt-wrapper.jar         | Bin 0 -> 7253 bytes
 .../kobalt/wrapper/kobalt-wrapper.properties  |   1 +
 .../resources/projects/kotlinFirst/kobaltw    |   2 ++
 .../src/main/java/example/JavaMain.java       |   8 ++++++
 .../src/main/kotlin/example/KotlinClass.kt    |  11 +++++++
 12 files changed, 93 insertions(+)
 create mode 100644 src/test/resources/projects/javaFirst/kobalt/src/Build.kt
 create mode 100644 src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.jar
 create mode 100644 src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties
 create mode 100755 src/test/resources/projects/javaFirst/kobaltw
 create mode 100644 src/test/resources/projects/javaFirst/src/main/java/example/JavaClass.java
 create mode 100644 src/test/resources/projects/javaFirst/src/main/kotlin/example/KotlinMain.kt
 create mode 100644 src/test/resources/projects/kotlinFirst/kobalt/src/Build.kt
 create mode 100644 src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.jar
 create mode 100644 src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties
 create mode 100755 src/test/resources/projects/kotlinFirst/kobaltw
 create mode 100644 src/test/resources/projects/kotlinFirst/src/main/java/example/JavaMain.java
 create mode 100644 src/test/resources/projects/kotlinFirst/src/main/kotlin/example/KotlinClass.kt

diff --git a/src/test/resources/projects/javaFirst/kobalt/src/Build.kt b/src/test/resources/projects/javaFirst/kobalt/src/Build.kt
new file mode 100644
index 00000000..3bc14f76
--- /dev/null
+++ b/src/test/resources/projects/javaFirst/kobalt/src/Build.kt
@@ -0,0 +1,27 @@
+import com.beust.kobalt.*
+import com.beust.kobalt.plugin.packaging.assemble
+import com.beust.kobalt.plugin.kotlin.*
+
+val repos = repos()
+
+
+val p = kotlinProject {
+
+    name = "mixed"
+    group = "com.example"
+    artifactId = name
+    version = "0.1"
+
+    sourceDirectories {
+        path("src/main/java", "src/main/kotlin")
+    }
+
+    assemble {
+        jar {
+            fatJar = true
+            manifest {
+                attributes("Main-Class", "example.KotlinMainKt")
+            }
+        }
+    }
+}
diff --git a/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.jar b/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6a522ad566ff2bce900acc37143915563289dfd4
GIT binary patch
literal 7253
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
X@!D!==>LSE{2hybSEs*00Kk6(lL3xA

literal 0
HcmV?d00001

diff --git a/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties b/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties
new file mode 100644
index 00000000..b19139e9
--- /dev/null
+++ b/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties
@@ -0,0 +1 @@
+kobalt.version=0.406
diff --git a/src/test/resources/projects/javaFirst/kobaltw b/src/test/resources/projects/javaFirst/kobaltw
new file mode 100755
index 00000000..1fd228db
--- /dev/null
+++ b/src/test/resources/projects/javaFirst/kobaltw
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $*
diff --git a/src/test/resources/projects/javaFirst/src/main/java/example/JavaClass.java b/src/test/resources/projects/javaFirst/src/main/java/example/JavaClass.java
new file mode 100644
index 00000000..12f0cfd2
--- /dev/null
+++ b/src/test/resources/projects/javaFirst/src/main/java/example/JavaClass.java
@@ -0,0 +1,8 @@
+package example;
+
+public class JavaClass {
+	public void run() {
+	    System.out.println("JavaClass run()");
+	}
+}
+
diff --git a/src/test/resources/projects/javaFirst/src/main/kotlin/example/KotlinMain.kt b/src/test/resources/projects/javaFirst/src/main/kotlin/example/KotlinMain.kt
new file mode 100644
index 00000000..297283ea
--- /dev/null
+++ b/src/test/resources/projects/javaFirst/src/main/kotlin/example/KotlinMain.kt
@@ -0,0 +1,6 @@
+package example
+
+fun main(argv: Array<String>) {
+	println("KotlinMain calling JavaClass().run()")
+	JavaClass().run()
+}
diff --git a/src/test/resources/projects/kotlinFirst/kobalt/src/Build.kt b/src/test/resources/projects/kotlinFirst/kobalt/src/Build.kt
new file mode 100644
index 00000000..3bc14f76
--- /dev/null
+++ b/src/test/resources/projects/kotlinFirst/kobalt/src/Build.kt
@@ -0,0 +1,27 @@
+import com.beust.kobalt.*
+import com.beust.kobalt.plugin.packaging.assemble
+import com.beust.kobalt.plugin.kotlin.*
+
+val repos = repos()
+
+
+val p = kotlinProject {
+
+    name = "mixed"
+    group = "com.example"
+    artifactId = name
+    version = "0.1"
+
+    sourceDirectories {
+        path("src/main/java", "src/main/kotlin")
+    }
+
+    assemble {
+        jar {
+            fatJar = true
+            manifest {
+                attributes("Main-Class", "example.KotlinMainKt")
+            }
+        }
+    }
+}
diff --git a/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.jar b/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6a522ad566ff2bce900acc37143915563289dfd4
GIT binary patch
literal 7253
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
X@!D!==>LSE{2hybSEs*00Kk6(lL3xA

literal 0
HcmV?d00001

diff --git a/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties b/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties
new file mode 100644
index 00000000..b19139e9
--- /dev/null
+++ b/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties
@@ -0,0 +1 @@
+kobalt.version=0.406
diff --git a/src/test/resources/projects/kotlinFirst/kobaltw b/src/test/resources/projects/kotlinFirst/kobaltw
new file mode 100755
index 00000000..1fd228db
--- /dev/null
+++ b/src/test/resources/projects/kotlinFirst/kobaltw
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $*
diff --git a/src/test/resources/projects/kotlinFirst/src/main/java/example/JavaMain.java b/src/test/resources/projects/kotlinFirst/src/main/java/example/JavaMain.java
new file mode 100644
index 00000000..e569b824
--- /dev/null
+++ b/src/test/resources/projects/kotlinFirst/src/main/java/example/JavaMain.java
@@ -0,0 +1,8 @@
+package example;
+
+public class JavaMain {
+	public static void main(String[] argv) {
+		System.out.println("JavaMain calling into Kotlin");
+		new KotlinClass().run();
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/projects/kotlinFirst/src/main/kotlin/example/KotlinClass.kt b/src/test/resources/projects/kotlinFirst/src/main/kotlin/example/KotlinClass.kt
new file mode 100644
index 00000000..611d2c87
--- /dev/null
+++ b/src/test/resources/projects/kotlinFirst/src/main/kotlin/example/KotlinClass.kt
@@ -0,0 +1,11 @@
+package example
+
+import kotlin.io.*
+
+class KotlinClass {
+	fun run() {
+	    println("KotlinClass run()")
+	}
+}
+
+

From 8765c6707c9f0f2a1ed1e92730d64a69f0afb52a Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 2 Feb 2016 23:08:44 +0400
Subject: [PATCH 5/6] Update tests to 0.408.

---
 .../projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties | 2 +-
 .../kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties b/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties
index b19139e9..4955abc4 100644
--- a/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties
+++ b/src/test/resources/projects/javaFirst/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=0.406
+kobalt.version=0.408
\ No newline at end of file
diff --git a/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties b/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties
index b19139e9..4955abc4 100644
--- a/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties
+++ b/src/test/resources/projects/kotlinFirst/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=0.406
+kobalt.version=0.408
\ No newline at end of file

From 6e3ce70f233b9236a166ff3ad4dd2544e0720f3d Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 2 Feb 2016 23:08:54 +0400
Subject: [PATCH 6/6] 0.408.

---
 kobalt/wrapper/kobalt-wrapper.properties | 2 +-
 src/main/resources/kobalt.properties     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties
index 5e75246b..4955abc4 100644
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=0.407
\ No newline at end of file
+kobalt.version=0.408
\ No newline at end of file
diff --git a/src/main/resources/kobalt.properties b/src/main/resources/kobalt.properties
index 1bfab0ca..909aab53 100644
--- a/src/main/resources/kobalt.properties
+++ b/src/main/resources/kobalt.properties
@@ -1 +1 @@
-kobalt.version=0.407
+kobalt.version=0.408