Fix flag contributor bug.

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ICompilerFlagContributor.kt

@@ -5,4 +5,10 @@ package com.beust.kobalt.api
  */
 interface ICompilerFlagContributor : IContributor {
     fun flagsFor(project: Project, context: KobaltContext, currentFlags: List<String>): List<String>
+    val flagPriority: Int
+        get() = DEFAULT_FLAG_PRIORITY
+
+    companion object {
+        val DEFAULT_FLAG_PRIORITY = 20
+    }
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/BaseJvmPlugin.kt

@@ -2,8 +2,20 @@ package com.beust.kobalt.internal
 
 import com.beust.kobalt.api.ConfigPlugin
 import com.beust.kobalt.api.ICompilerFlagContributor
+import com.beust.kobalt.api.Project
 
 /**
  * Base class for JVM language plug-ins.
  */
-abstract class BaseJvmPlugin<T>: ConfigPlugin<T>(), ICompilerFlagContributor
+abstract class BaseJvmPlugin<T> : ConfigPlugin<T>(), ICompilerFlagContributor {
+    companion object {
+        // Run before other flag contributors
+        val FLAG_CONTRIBUTOR_PRIORITY = ICompilerFlagContributor.DEFAULT_FLAG_PRIORITY - 10
+    }
+
+    protected fun maybeCompilerArgs(project: Project, args: List<String>)
+        = if (accept(project)) args else emptyList()
+
+    override val flagPriority = FLAG_CONTRIBUTOR_PRIORITY
+
+}

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt

@@ -29,10 +29,14 @@ class JvmCompiler @Inject constructor(val dependencyManager: DependencyManager)
             .distinct()
 
         // Plugins that add flags to the compiler
-        val contributorFlags = if (project != null) {
+        val currentFlags = arrayListOf<String>().apply { addAll(info.compilerArgs) }
-            context.pluginInfo.compilerFlagContributors.flatMap {
+        val contributorFlags : List<String> = if (project != null) {
-                it.flagsFor(project, context, info.compilerArgs)
+            val contributors = context.pluginInfo.compilerFlagContributors
+            contributors.sortBy { it.flagPriority }
+            context.pluginInfo.compilerFlagContributors.forEach {
+                currentFlags.addAll(it.flagsFor(project, context, currentFlags))
             }
+            currentFlags
         } else {
             emptyList()
         }

src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt

@@ -38,9 +38,10 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler)
         return result
     }
 
+    // ICompilerFlagsContributor
     // ICompilerFlagsContributor
     override fun flagsFor(project: Project, context: KobaltContext, currentFlags: List<String>)
-            = configurationFor(project)?.compilerArgs ?: listOf<String>()
+            = maybeCompilerArgs(project, configurationFor(project)?.compilerArgs ?: listOf<String>())
 
     // ICompilerContributor
     override val sourceSuffixes = listOf("java")

src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt

@@ -152,7 +152,7 @@ class KConfiguration @Inject constructor(val compiler: KotlinCompiler){
     fun compilerArgs(s: List<String>) = args.addAll(s)
 
     fun compile(project: Project? = null, context: KobaltContext? = null) : TaskResult {
-        return compiler.compile(project, context, dependencies, classpath, source, output, args + "-no-stdlib")
+        return compiler.compile(project, context, dependencies, classpath, source, output, args)
     }
 }
 

src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt

@@ -38,7 +38,8 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors)
 
     // ICompilerFlagsContributor
     override fun flagsFor(project: Project, context: KobaltContext, currentFlags: List<String>)
-        = configurationFor(project)?.compilerArgs ?: listOf<String>()
+            = maybeCompilerArgs(project, (configurationFor(project)?.compilerArgs ?: listOf<String>()) +
+                    listOf("-no-stdlib"))
 
     //    override fun generateDoc(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult {
 //        val configs = dokkaConfigurations[project.name]