From dff35d627afcc0ab3125dc8563c545ce31b79e16 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 3 Feb 2016 01:07:38 +0400 Subject: [PATCH] Cleaner. --- .../kotlin/com/beust/kobalt/api/Project.kt | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt index cd532172..eb56be9c 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt @@ -43,31 +43,18 @@ open class Project( // @Directive - fun sourceDirectories(init: Sources.() -> Unit) : Sources { - val sources = Sources(this, sourceDirectories) - sources.init() - return sources - } + fun sourceDirectories(init: Sources.() -> Unit) = Sources(this, sourceDirectories).apply { init() } var sourceDirectories : HashSet = hashSetOf() get() = if (field.isEmpty()) projectInfo.defaultSourceDirectories else field - set(value) { - field = value - } + set(value) { field = value } @Directive - fun sourceDirectoriesTest(init: Sources.() -> Unit) : Sources { - val sources = Sources(this, sourceDirectoriesTest) - sources.init() - return sources - } + fun sourceDirectoriesTest(init: Sources.() -> Unit) = Sources(this, sourceDirectoriesTest).apply { init() } var sourceDirectoriesTest : HashSet = hashSetOf() - get() = if (field.isEmpty()) projectInfo.defaultTestDirectories - else field - set(value) { - field = value - } + get() = if (field.isEmpty()) projectInfo.defaultTestDirectories else field + set(value) { field = value } // // Dependencies