erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 00:38:11 -07:00
Code Releases Activity

Fix the compiler bug.

Browse source
This commit is contained in:
Cedric Beust 2016-06-24 20:10:59 -07:00
parent eb575abc14
commit b62e167cde
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,9 @@ abstract class BaseJvmPlugin<T>(open val configActor: ConfigActor<T>) :
// IBuildConfigContributor // IBuildConfigContributor
private fun hasSourceFiles(project: Project) private fun hasSourceFiles(project: Project)
= KFiles.findSourceFiles(project.directory, project.sourceDirectories, listOf("java")).size > 0 = KFiles.findSourceFiles(project.directory, project.sourceDirectories, sourceSuffixes()).size > 0
fun affinity(project: Project) = if (hasSourceFiles(project)) 1 else 0 fun affinity(project: Project) = if (hasSourceFiles(project)) 1 else 0
abstract fun sourceSuffixes() : List<String>
} }

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

@ -17,7 +17,8 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler, override va
ITestSourceDirectoryContributor, IBuildConfigContributor { ITestSourceDirectoryContributor, IBuildConfigContributor {
companion object { companion object {
const val PLUGIN_NAME = "Java" val PLUGIN_NAME = "Java"
val SOURCE_SUFFIXES = listOf("java")
} }
override val name = PLUGIN_NAME override val name = PLUGIN_NAME
@ -26,6 +27,8 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler, override va
override fun affinity(project: Project, context: KobaltContext) = override fun affinity(project: Project, context: KobaltContext) =
if (accept(project)) 1 else 0 if (accept(project)) 1 else 0
override fun sourceSuffixes() = SOURCE_SUFFIXES
override fun generateDoc(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult { override fun generateDoc(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult {
val result = val result =
if (info.sourceFiles.size > 0) { if (info.sourceFiles.size > 0) {
@ -44,7 +47,7 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler, override va
configurationFor(project)?.compilerArgs ?: listOf<String>()) configurationFor(project)?.compilerArgs ?: listOf<String>())
// ICompilerContributor // ICompilerContributor
val compiler = CompilerDescription(listOf("java"), "java", javaCompiler) val compiler = CompilerDescription(SOURCE_SUFFIXES, "java", javaCompiler)
override fun compilersFor(project: Project, context: KobaltContext) = listOf(compiler) override fun compilersFor(project: Project, context: KobaltContext) = listOf(compiler)

7
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
View file

@ -24,11 +24,14 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors, val depen
IBuildConfigContributor { IBuildConfigContributor {
companion object { companion object {
const val PLUGIN_NAME = "Kotlin" val PLUGIN_NAME = "Kotlin"
val SOURCE_SUFFIXES = listOf("kt")
} }
override val name = PLUGIN_NAME override val name = PLUGIN_NAME
override fun sourceSuffixes() = SOURCE_SUFFIXES
// IDocContributor // IDocContributor
override fun affinity(project: Project, context: KobaltContext) = override fun affinity(project: Project, context: KobaltContext) =
if (project.sourceDirectories.any { it.contains("kotlin") }) 2 else 0 if (project.sourceDirectories.any { it.contains("kotlin") }) 2 else 0
@ -108,7 +111,7 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors, val depen
// ICompilerContributor // ICompilerContributor
/** The Kotlin compiler should run before the Java one, hence priority - 5 */ /** The Kotlin compiler should run before the Java one, hence priority - 5 */
val compiler = CompilerDescription(listOf("kt"), "kotlin", KotlinCompiler(), val compiler = CompilerDescription(SOURCE_SUFFIXES, "kotlin", KotlinCompiler(),
ICompilerDescription.DEFAULT_PRIORITY - 5) ICompilerDescription.DEFAULT_PRIORITY - 5)
override fun compilersFor(project: Project, context: KobaltContext) = arrayListOf(compiler) override fun compilersFor(project: Project, context: KobaltContext) = arrayListOf(compiler)