Move kotlinTasks, update README, minor refactoring

1 files changed, 4 insertions, 25 deletions

diff --git a/runners/android-gradle-plugin/src/main/kotlin/mainAndroid.kt b/runners/android-gradle-plugin/src/main/kotlin/mainAndroid.kt
index 1daa1035..8aa76ef8 100644
--- a/runners/android-gradle-plugin/src/main/kotlin/mainAndroid.kt
+++ b/runners/android-gradle-plugin/src/main/kotlin/mainAndroid.kt
@@ -2,37 +2,16 @@ package org.jetbrains.dokka.gradle
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.Input
-import org.gradle.util.GradleVersion
 import org.jetbrains.dokka.DokkaConfiguration.ExternalDocumentationLink.Builder
 import org.jetbrains.dokka.DokkaConfiguration.SourceRoot
 import java.io.File
 
 open class DokkaAndroidPlugin : DokkaPlugin() {
-    override fun apply(project: Project) {
-        DokkaVersion.loadFrom(javaClass.getResourceAsStream("/META-INF/gradle-plugins/org.jetbrains.dokka.properties"))
-
-        val dokkaRuntimeConfiguration = project.configurations.create("dokkaRuntime")
-        val defaultDokkaRuntimeConfiguration = project.configurations.create("defaultDokkaRuntime")
-        val taskName = "dokka"
-
-        defaultDokkaRuntimeConfiguration.defaultDependencies{ dependencies -> dependencies.add(project.dependencies.create("org.jetbrains.dokka:dokka-fatjar:${DokkaVersion.version}")) }
-
-        if(GradleVersion.current() >= GradleVersion.version("4.10")) {
-            project.tasks.register(taskName, DokkaAndroidTask::class.java).configure {
-                it.outputDirectory = File(project.buildDir, taskName).absolutePath
-            }
-        } else {
-            project.tasks.create(taskName, DokkaAndroidTask::class.java).apply {
-                outputDirectory = File(project.buildDir, taskName).absolutePath
-            }
-        }
 
-        project.tasks.withType(DokkaAndroidTask::class.java) { task ->
-            task.multiplatform = project.container(GradlePassConfigurationImpl::class.java)
-            task.configuration = GradlePassConfigurationImpl()
-            task.dokkaRuntime = dokkaRuntimeConfiguration
-            task.defaultDokkaRuntime = defaultDokkaRuntimeConfiguration
-        }
+    override fun apply(project: Project) {
+        loadDokkaVersion()
+        val dokkaRuntimeConfiguration = addConfiguration(project)
+        addTasks(project, dokkaRuntimeConfiguration, DokkaAndroidTask::class.java)
     }
 }