From 90455bcfbe8638051e7a419778f8e5da222207d7 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 13 Dec 2015 03:48:49 +0400 Subject: [PATCH] Hide dynamicPlugins. --- src/main/kotlin/com/beust/kobalt/BuildScript.kt | 6 ++---- src/main/kotlin/com/beust/kobalt/Plugins.kt | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/BuildScript.kt b/src/main/kotlin/com/beust/kobalt/BuildScript.kt index 1b96858b..11a783fd 100644 --- a/src/main/kotlin/com/beust/kobalt/BuildScript.kt +++ b/src/main/kotlin/com/beust/kobalt/BuildScript.kt @@ -5,7 +5,6 @@ import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.dependency.FileDependency -import com.beust.kobalt.misc.KobaltExecutors import java.io.File @Directive @@ -17,15 +16,14 @@ fun file(file: String) : String = FileDependency.PREFIX_FILE + file @Directive fun plugins(vararg dependency : IClasspathDependency) { - Plugins.dynamicPlugins.addAll(dependency) + dependency.forEach { Plugins.addDynamicPlugin(it) } } @Directive fun plugins(vararg dependencies : String) { - val executor = Kobalt.INJECTOR.getInstance(KobaltExecutors::class.java).miscExecutor val factory = Kobalt.INJECTOR.getInstance(DepFactory::class.java) dependencies.forEach { - Plugins.dynamicPlugins.add(factory.create(it, executor)) + Plugins.addDynamicPlugin(factory.create(it)) } } diff --git a/src/main/kotlin/com/beust/kobalt/Plugins.kt b/src/main/kotlin/com/beust/kobalt/Plugins.kt index 2de5cdc9..9720613b 100644 --- a/src/main/kotlin/com/beust/kobalt/Plugins.kt +++ b/src/main/kotlin/com/beust/kobalt/Plugins.kt @@ -41,7 +41,8 @@ public class Plugins @Inject constructor (val taskManagerProvider : Provider = arrayListOf() + internal val dynamicPlugins : ArrayList = arrayListOf() + fun addDynamicPlugin(plugin: IClasspathDependency) = dynamicPlugins.add(plugin) val defaultPlugin : IPlugin get() = findPlugin(KobaltPlugin.PLUGIN_NAME)!!