From 234172a1a79014a66203fb257ddbb6181773f063 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sat, 23 Apr 2016 05:13:52 -0800 Subject: [PATCH] More IContributors. --- .../main/kotlin/com/beust/kobalt/api/IAssemblyContributor.kt | 2 +- .../kotlin/com/beust/kobalt/api/IBuildConfigFieldContributor.kt | 2 +- .../main/kotlin/com/beust/kobalt/api/ICompilerContributor.kt | 2 +- .../src/main/kotlin/com/beust/kobalt/api/IDocContributor.kt | 2 +- .../com/beust/kobalt/api/IIncrementalAssemblyContributor.kt | 2 +- .../kotlin/com/beust/kobalt/api/ISourceDirectoryContributor.kt | 2 +- .../main/kotlin/com/beust/kobalt/api/ITemplateContributor.kt | 2 +- .../com/beust/kobalt/api/ITestSourceDirectoryContributor.kt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IAssemblyContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IAssemblyContributor.kt index 64c1d19b..6c35fc1d 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IAssemblyContributor.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IAssemblyContributor.kt @@ -5,6 +5,6 @@ import com.beust.kobalt.TaskResult /** * Plug-ins that will be invoked during the "assemble" task. */ -interface IAssemblyContributor { +interface IAssemblyContributor : IContributor { fun assemble(project: Project, context: KobaltContext) : TaskResult } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IBuildConfigFieldContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IBuildConfigFieldContributor.kt index 8c4dc843..0d26032f 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IBuildConfigFieldContributor.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IBuildConfigFieldContributor.kt @@ -5,6 +5,6 @@ class BuildConfigField(val type: String, val name: String, val value: Any) /** * Plug-ins that want to add fields to BuildConfig need to implement this interface. */ -interface IBuildConfigFieldContributor { +interface IBuildConfigFieldContributor : IContributor { fun fieldsFor(project: Project, context: KobaltContext) : List } 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 408f55a0..84f6694d 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 @@ -35,6 +35,6 @@ interface ICompiler : Comparable { val canCompileDirectories: Boolean get() = false } -interface ICompilerContributor : IProjectAffinity { +interface ICompilerContributor : IProjectAffinity, IContributor { fun compilersFor(project: Project, context: KobaltContext): List } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IDocContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IDocContributor.kt index 8979783f..48797530 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IDocContributor.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IDocContributor.kt @@ -2,7 +2,7 @@ package com.beust.kobalt.api import com.beust.kobalt.TaskResult -interface IDocContributor : IProjectAffinity { +interface IDocContributor : IProjectAffinity, IContributor { fun generateDoc(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IIncrementalAssemblyContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IIncrementalAssemblyContributor.kt index a11ab639..cd730171 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IIncrementalAssemblyContributor.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IIncrementalAssemblyContributor.kt @@ -6,7 +6,7 @@ import com.beust.kobalt.IncrementalTaskInfo * Plug-ins that will be invoked during the "assemble" task and wish to return an incremental task instead * of a regular one. */ -interface IIncrementalAssemblyContributor { +interface IIncrementalAssemblyContributor : IContributor { fun assemble(project: Project, context: KobaltContext) : IncrementalTaskInfo } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ISourceDirectoryContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ISourceDirectoryContributor.kt index e8b25ab5..fced0771 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ISourceDirectoryContributor.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ISourceDirectoryContributor.kt @@ -5,7 +5,7 @@ import java.io.File /** * Plug-ins that add source directories to be compiled need to implement this interface. */ -interface ISourceDirectoryContributor { +interface ISourceDirectoryContributor : IContributor { fun sourceDirectoriesFor(project: Project, context: KobaltContext): List } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITemplateContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITemplateContributor.kt index 5d469df4..9af4bb7d 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITemplateContributor.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITemplateContributor.kt @@ -6,7 +6,7 @@ import com.beust.kobalt.Args * Plugins that want to participate in the --init process (they can generate files to initialize * a new project). */ -interface ITemplateContributor { +interface ITemplateContributor : IContributor { companion object { val DIRECTORY_NAME = "templates" } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITestSourceDirectoryContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITestSourceDirectoryContributor.kt index eb9ffc2b..60b18011 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITestSourceDirectoryContributor.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITestSourceDirectoryContributor.kt @@ -5,7 +5,7 @@ import java.io.File /** * Plug-ins that add tets source directories to be compiled need to implement this interface. */ -interface ITestSourceDirectoryContributor { +interface ITestSourceDirectoryContributor : IContributor { fun testSourceDirectoriesFor(project: Project, context: KobaltContext): List }