From cb101cd4102467f8c3bbe842bfb5416a5a7c1d3c Mon Sep 17 00:00:00 2001 From: Juan Liska Date: Wed, 15 Feb 2017 07:12:21 -0600 Subject: [PATCH] return config objects from directives --- .../kobalt/plugin/publish/PublishPlugin.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt index 43318837..9ffea810 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt @@ -206,12 +206,11 @@ data class GithubConfig(val project: Project) { } @Directive -fun Project.github(init: GithubConfig.() -> Unit) { - with(GithubConfig(this)) { - init() - (Kobalt.findPlugin(PublishPlugin.PLUGIN_NAME) as PublishPlugin).addGithubConfiguration(name, this) +fun Project.github(init: GithubConfig.() -> Unit): GithubConfig = + GithubConfig(this).also { config -> + config.init() + (Kobalt.findPlugin(PublishPlugin.PLUGIN_NAME) as PublishPlugin).addGithubConfiguration(name, config) } -} data class BintrayConfig(val project: Project) { /** @@ -245,9 +244,8 @@ data class BintrayConfig(val project: Project) { } @Directive -fun Project.bintray(init: BintrayConfig.() -> Unit) { - with(BintrayConfig(this)) { - init() - (Kobalt.findPlugin(PublishPlugin.PLUGIN_NAME) as PublishPlugin).addBintrayConfiguration(name, this) +fun Project.bintray(init: BintrayConfig.() -> Unit) = + BintrayConfig(this).also { config -> + config.init() + (Kobalt.findPlugin(PublishPlugin.PLUGIN_NAME) as PublishPlugin).addBintrayConfiguration(name, config) } -}