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

Rename Plugin -> IPlugin.

Browse source
This commit is contained in:
Cedric Beust 2015-11-07 19:50:29 -08:00
parent 4c24dd704d
commit 7c20a0313f
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/com/beust/kobalt/BasePluginTask.kt
View file

@ -1,12 +1,12 @@
package com.beust.kobalt
import com.beust.kobalt.api.Plugin
import com.beust.kobalt.api.IPlugin
import com.beust.kobalt.api.PluginTask
import com.beust.kobalt.api.Project
import com.beust.kobalt.internal.TaskResult
import com.beust.kobalt.internal.TaskResult2
public abstract class BasePluginTask(override val plugin: Plugin,
public abstract class BasePluginTask(override val plugin: IPlugin,
override val name: String,
override val doc: String,
override val project: Project)

14
src/main/kotlin/com/beust/kobalt/Plugins.kt
View file

@ -30,13 +30,13 @@ public class Plugins @Inject constructor (val taskManagerProvider : Provider<Tas
val pluginInfo: PluginInfo) {
companion object {
private var pluginMap = hashMapOf<String, Plugin>()
private var pluginMap = hashMapOf<String, IPlugin>()
fun addPluginInstance(plugin: Plugin) {
fun addPluginInstance(plugin: IPlugin) {
pluginMap.put(plugin.name, plugin)
}
val plugins : List<Plugin>
val plugins : List<IPlugin>
get() = ArrayList(pluginMap.values)
/**
@ -44,9 +44,9 @@ public class Plugins @Inject constructor (val taskManagerProvider : Provider<Tas
*/
val dynamicPlugins : ArrayList<IClasspathDependency> = arrayListOf()
val defaultPlugin : Plugin get() = findPlugin(KobaltDefaultPlugin.NAME)!!
val defaultPlugin : IPlugin get() = findPlugin(KobaltDefaultPlugin.NAME)!!
fun findPlugin(name: String) : Plugin? = pluginMap[name]
fun findPlugin(name: String) : IPlugin? = pluginMap[name]
}
fun applyPlugins(context: KobaltContext, projects: List<Project>) {
@ -86,7 +86,7 @@ public class Plugins @Inject constructor (val taskManagerProvider : Provider<Tas
val annotation = it.second
log(3, "Adding MethodTask from @Task: ${it.first} $annotation")
plugin.methodTasks.add(Plugin.MethodTask(it.first, annotation))
plugin.methodTasks.add(IPlugin.MethodTask(it.first, annotation))
}
currentClass = currentClass.superclass
@ -98,7 +98,7 @@ public class Plugins @Inject constructor (val taskManagerProvider : Provider<Tas
val method = methodTask.method
val annotation = methodTask.taskAnnotation
fun toTask(m: Method, project: Project, plugin: Plugin): (Project) -> TaskResult {
fun toTask(m: Method, project: Project, plugin: IPlugin): (Project) -> TaskResult {
val result: (Project) -> TaskResult = {
m.invoke(plugin, project) as TaskResult
}

4
src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt
View file

@ -5,10 +5,10 @@ import com.beust.kobalt.internal.TaskManager
import java.util.*
import kotlin.properties.Delegates
abstract public class BasePlugin : Plugin {
abstract public class BasePlugin : IPlugin {
override val tasks: ArrayList<PluginTask> = arrayListOf()
override var taskManager: TaskManager by Delegates.notNull()
override var methodTasks = arrayListOf<Plugin.MethodTask>()
override var methodTasks = arrayListOf<IPlugin.MethodTask>()
override fun accept(project: Project) = true
var plugins: Plugins by Delegates.notNull()

2
src/main/kotlin/com/beust/kobalt/api/Plugin.kt → src/main/kotlin/com/beust/kobalt/api/IPlugin.kt
View file

@ -8,7 +8,7 @@ import com.beust.kobalt.internal.TaskResult2
import java.lang.reflect.Method
import java.util.*
public interface Plugin {
public interface IPlugin {
val name: String
val tasks : ArrayList<PluginTask>
fun accept(project: Project) : Boolean

4
src/main/kotlin/com/beust/kobalt/api/KobaltPluginXml.kt
View file

@ -66,7 +66,7 @@ class ClassNameXml {
* needs to access plug-in info can then just inject a PluginInfo object.
*/
class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) {
val plugins = arrayListOf<Plugin>()
val plugins = arrayListOf<IPlugin>()
val projectContributors = arrayListOf<IProjectContributor>()
val classpathContributors = arrayListOf<IClasspathContributor>()
val initContributors = arrayListOf<IInitContributor>()
@ -120,7 +120,7 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) {
else Class.forName(className)
xml.plugins?.className?.forEach {
plugins.add(factory.instanceOf(forName(it)) as Plugin)
plugins.add(factory.instanceOf(forName(it)) as IPlugin)
}
xml.classpathClassName?.className?.forEach {
classpathContributors.add(factory.instanceOf(forName(it)) as IClasspathContributor)

2
src/main/kotlin/com/beust/kobalt/api/PluginTask.kt
View file

@ -5,7 +5,7 @@ import com.beust.kobalt.misc.toString
import java.util.concurrent.Callable
abstract public class PluginTask : Callable<TaskResult2<PluginTask>> {
abstract val plugin: Plugin
abstract val plugin: IPlugin
open val name: String = ""
open val doc: String = ""
abstract val project: Project

2
src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt
View file

@ -240,7 +240,7 @@ public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val b
} else {
val taskAnnotation = method.getAnnotation(Task::class.java)
if (taskAnnotation != null) {
Plugins.defaultPlugin.methodTasks.add(Plugin.MethodTask(method, taskAnnotation))
Plugins.defaultPlugin.methodTasks.add(IPlugin.MethodTask(method, taskAnnotation))
}
}}