From 385a5005a1cbccb13730634ffe81150190fd358e Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Tue, 2 Feb 2016 16:57:31 -0800 Subject: [PATCH] Fix lateinit bug. Fix #110. --- .../com/beust/kobalt/plugin/java/JavaPlugin.kt | 4 ++-- .../com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) 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 f9590864..e227ce58 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt @@ -33,11 +33,11 @@ class JavaPlugin @Inject constructor( override val name = PLUGIN_NAME - override fun accept(project: Project) = project is JavaProject + override fun accept(project: Project) = project.sourceDirectories.any { it.contains("java") } // IDocContributor override fun affinity(project: Project, context: KobaltContext) = - if (project.sourceDirectories.any { it.contains("java") }) 1 else 0 + if (accept(project)) 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/kotlin/KotlinPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt index b0870435..d4074085 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt @@ -33,9 +33,17 @@ class KotlinPlugin @Inject constructor( const val PLUGIN_NAME = "Kotlin" } + override fun apply(project: Project, context: KobaltContext) { + super.apply(project, context) + } + override val name = PLUGIN_NAME - override fun accept(project: Project) = project is KotlinProject + override fun accept(project: Project) = project.sourceDirectories.any { it.contains("kotlin") } + + // IDocContributor + override fun affinity(project: Project, context: KobaltContext) = + if (project.sourceDirectories.any { it.contains("kotlin") }) 2 else 0 override fun generateDoc(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult { return TaskResult() @@ -127,9 +135,6 @@ class KotlinPlugin @Inject constructor( override val sourceSuffixes = listOf("kt") - override fun affinity(project: Project, context: KobaltContext) = - if (project.sourceDirectories.any { it.contains("kotlin") }) 2 else 0 - override fun compile(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult { val result = if (info.sourceFiles.size > 0) {