diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/BuildScript.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/BuildScript.kt index a91e82e0..3d75614e 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/BuildScript.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/BuildScript.kt @@ -16,12 +16,15 @@ var BUILD_SCRIPT_CONFIG : BuildScriptConfig? = null class BuildScriptConfig { /** The list of repos used to locate plug-ins. */ + @Directive fun repos(vararg r: String) = newRepos(*r) /** The list of plug-ins to use for this build file. */ + @Directive fun plugins(vararg pl: String) = newPlugins(*pl) /** The build file classpath. */ + @Directive fun buildFileClasspath(vararg bfc: String) = newBuildFileClasspath(*bfc) // The following settings modify the compiler used to compile the build file. @@ -31,11 +34,6 @@ class BuildScriptConfig { var kobaltCompilerFlags: String? = null } -@Directive -fun buildScript(init: BuildScriptConfig.() -> Unit) { - BUILD_SCRIPT_CONFIG = BuildScriptConfig().apply { init() } -} - @Directive fun homeDir(vararg dirs: String) : String = SystemProperties.homeDir + File.separator + dirs.toMutableList().joinToString(File.separator) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt index ef96a5f1..f665f5d2 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt @@ -14,3 +14,9 @@ fun project(vararg projects: Project, init: Project.() -> Unit): Project { } } +@Directive +fun buildScript(init: BuildScriptConfig.() -> Unit): BuildScriptConfig { + val buildScriptConfig = BuildScriptConfig().apply { init() } + BUILD_SCRIPT_CONFIG = buildScriptConfig + return buildScriptConfig +} \ No newline at end of file