From dff07a0aa73df1a9986d160ca7f97677d049ffeb Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 19 Jun 2017 18:50:57 +0300 Subject: Prevent early evaluation of kotlinTasks. To work with kotlin-android --- runners/gradle-plugin/src/main/kotlin/main.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'runners/gradle-plugin/src/main') diff --git a/runners/gradle-plugin/src/main/kotlin/main.kt b/runners/gradle-plugin/src/main/kotlin/main.kt index bd4b3ab3..fd4053ee 100644 --- a/runners/gradle-plugin/src/main/kotlin/main.kt +++ b/runners/gradle-plugin/src/main/kotlin/main.kt @@ -21,6 +21,7 @@ import java.io.InputStream import java.io.Serializable import java.net.URLClassLoader import java.util.* +import java.util.concurrent.Callable import java.util.function.BiConsumer open class DokkaPlugin : Plugin { @@ -53,10 +54,10 @@ object ClassloaderContainer { open class DokkaTask : DefaultTask() { fun defaultKotlinTasks() = with(ReflectDsl) { - val abstractKotlinCompileClz = try { project.buildscript.classLoader.loadClass(ABSTRACT_KOTLIN_COMPILE) } catch (cnfe: ClassNotFoundException) { + logger.warn("$ABSTRACT_KOTLIN_COMPILE class not found, default kotlin tasks ignored") return@with emptyList() } @@ -66,9 +67,9 @@ open class DokkaTask : DefaultTask() { init { group = JavaBasePlugin.DOCUMENTATION_GROUP description = "Generates dokka documentation for Kotlin" - project.afterEvaluate { - this.dependsOn(kotlinTasks.flatMap { it.dependsOn }) - } + + @Suppress("LeakingThis") + dependsOn(Callable { kotlinTasks.flatMap { it.dependsOn } }) } @Input -- cgit