From de6fcd2c453ccd756d680fcaeb3a900048469c24 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 15 Nov 2015 17:08:34 -0800 Subject: [PATCH] A few more dependencies in the context. --- src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt | 4 ++++ .../com/beust/kobalt/kotlin/BuildFileCompiler.kt | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt b/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt index 207742fc..453acc63 100644 --- a/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt +++ b/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt @@ -3,10 +3,14 @@ package com.beust.kobalt.api import com.beust.kobalt.Args import com.beust.kobalt.Plugins import com.beust.kobalt.internal.PluginInfo +import com.beust.kobalt.maven.DependencyManager +import com.beust.kobalt.misc.KobaltExecutors public class KobaltContext(val args: Args) { fun findPlugin(name: String) = Plugins.findPlugin(name) lateinit var pluginInfo: PluginInfo lateinit var pluginProperties: PluginProperties + lateinit var dependencyManager: DependencyManager + lateinit var executors: KobaltExecutors } diff --git a/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt b/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt index a00f3a84..945e4d98 100644 --- a/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt @@ -8,10 +8,7 @@ import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.IClasspathDependency -import com.beust.kobalt.misc.KFiles -import com.beust.kobalt.misc.Topological -import com.beust.kobalt.misc.countChar -import com.beust.kobalt.misc.log +import com.beust.kobalt.misc.* import com.beust.kobalt.plugin.kotlin.kotlinCompilePrivate import com.google.inject.assistedinject.Assisted import rx.subjects.PublishSubject @@ -34,7 +31,8 @@ import javax.inject.Inject */ public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val buildFiles: List, @Assisted val pluginInfo: PluginInfo, val files: KFiles, val plugins: Plugins, - val dependencyManager: DependencyManager, val pluginProperties: PluginProperties) { + val dependencyManager: DependencyManager, val pluginProperties: PluginProperties, + val executors: KobaltExecutors) { interface IFactory { fun create(@Assisted("buildFiles") buildFiles: List, pluginInfo: PluginInfo) : BuildFileCompiler @@ -51,6 +49,8 @@ public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val b val context = KobaltContext(args) context.pluginInfo = pluginInfo context.pluginProperties = pluginProperties + context.dependencyManager = dependencyManager + context.executors = executors Kobalt.context = context //