diff --git a/src/main/kotlin/com/beust/kobalt/api/ICompilerFlagContributor.kt b/src/main/kotlin/com/beust/kobalt/api/ICompilerFlagContributor.kt index 87757868..13396d0e 100644 --- a/src/main/kotlin/com/beust/kobalt/api/ICompilerFlagContributor.kt +++ b/src/main/kotlin/com/beust/kobalt/api/ICompilerFlagContributor.kt @@ -4,5 +4,5 @@ package com.beust.kobalt.api * Plugins that add compiler flags. */ interface ICompilerFlagContributor : IContributor { - fun flagsFor(project: Project, currentFlags: List): List + fun flagsFor(project: Project, context: KobaltContext, currentFlags: List): List } diff --git a/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt b/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt index b6c3d1ff..a770ffc5 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt @@ -31,7 +31,7 @@ class JvmCompiler @Inject constructor(val dependencyManager: DependencyManager) // Plugins that add flags to the compiler val contributorFlags = if (project != null) { context.pluginInfo.compilerFlagContributors.flatMap { - it.flagsFor(project, info.compilerArgs) + it.flagsFor(project, context, info.compilerArgs) } } else { emptyList() diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt index 9d61a956..d0706870 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -164,7 +164,7 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v * Make sure we compile and generate 1.6 sources unless the build file defined those (which can * happen if the developer is using RetroLambda for example). */ - override fun flagsFor(project: Project, currentFlags: List) : List { + override fun flagsFor(project: Project, context: KobaltContext, currentFlags: List) : List { if (isAndroid(project)) { var found = currentFlags.any { it == "-source" || it == "-target" } val result = arrayListOf().apply { addAll(currentFlags) }