From 9ca7f7a1613ae97da7d4843a4e15daae7f77f594 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Sat, 5 Dec 2015 08:20:20 -0800
Subject: [PATCH] Refactoring.

---
 .../kotlin/com/beust/kobalt/api/BasePlugin.kt     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt b/src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt
index df20bb0a..81add97a 100644
--- a/src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt
@@ -2,14 +2,11 @@ package com.beust.kobalt.api
 
 import com.beust.kobalt.Plugins
 import com.beust.kobalt.internal.TaskManager
-import kotlin.properties.Delegates
 
 abstract public class BasePlugin : IPlugin {
-    override var taskManager: TaskManager by Delegates.notNull()
-    override fun accept(project: Project) = true
-    var plugins: Plugins by Delegates.notNull()
+    lateinit var context: KobaltContext
 
-    var context: KobaltContext by Delegates.notNull()
+    override fun accept(project: Project) = true
 
     override fun apply(project: Project, context: KobaltContext) {
         this.context = context
@@ -17,7 +14,9 @@ abstract public class BasePlugin : IPlugin {
 
     protected val projects = arrayListOf<ProjectDescription>()
 
-    fun addProject(project: Project, dependsOn: Array<out Project>) {
-        projects.add(ProjectDescription(project, dependsOn.toList()))
-    }
+    fun addProject(project: Project, dependsOn: Array<out Project>) =
+            projects.add(ProjectDescription(project, dependsOn.toList()))
+
+    override lateinit var taskManager: TaskManager
+    lateinit var plugins: Plugins
 }