From 34e696f92aaa3802f13a0074003bc8957218aeba Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Tue, 14 Jul 2020 11:36:47 +0200 Subject: Refactor and add integration tests --- runners/maven-plugin/src/main/kotlin/DokkaMojo.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'runners/maven-plugin') diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt index 5b904dce..514df151 100644 --- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt +++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt @@ -52,7 +52,7 @@ class ExternalDocumentationLinkBuilder : DokkaConfiguration.ExternalDocumentatio override var packageListUrl: URL? = null } -abstract class AbstractDokkaMojo : AbstractMojo() { +abstract class AbstractDokkaMojo(private val defaultDokkaPlugins: List) : AbstractMojo() { class SourceRoot : DokkaConfiguration.SourceRoot { @Parameter(required = true) override var path: String = "" @@ -166,7 +166,8 @@ abstract class AbstractDokkaMojo : AbstractMojo() { var failOnWarning: Boolean = DokkaDefaults.failOnWarning @Parameter - open var dokkaPlugins: List = emptyList() + var dokkaPlugins: List = emptyList() + get() = field + defaultDokkaPlugins protected abstract fun getOutDir(): String @@ -315,7 +316,7 @@ abstract class AbstractDokkaMojo : AbstractMojo() { requiresDependencyResolution = ResolutionScope.COMPILE, requiresProject = true ) -class DokkaMojo : AbstractDokkaMojo() { +class DokkaMojo : AbstractDokkaMojo(emptyList()) { @Parameter(required = true, defaultValue = "\${project.basedir}/target/dokka") var outputDir: String = "" @@ -329,12 +330,10 @@ class DokkaMojo : AbstractDokkaMojo() { requiresDependencyResolution = ResolutionScope.COMPILE, requiresProject = true ) -class DokkaJavadocMojo : AbstractDokkaMojo() { +class DokkaJavadocMojo : AbstractDokkaMojo(listOf(javadocDependency)) { @Parameter(required = true, defaultValue = "\${project.basedir}/target/dokkaJavadoc") var outputDir: String = "" - override var dokkaPlugins = super.dokkaPlugins + javadocDependency - override fun getOutDir() = outputDir } @@ -345,7 +344,7 @@ class DokkaJavadocMojo : AbstractDokkaMojo() { requiresDependencyResolution = ResolutionScope.COMPILE, requiresProject = true ) -class DokkaJavadocJarMojo : AbstractDokkaMojo() { +class DokkaJavadocJarMojo : AbstractDokkaMojo(listOf(javadocDependency)) { @Parameter(required = true, defaultValue = "\${project.basedir}/target/dokkaJavadocJar") var outputDir: String = "" @@ -392,8 +391,6 @@ class DokkaJavadocJarMojo : AbstractDokkaMojo() { override fun getOutDir() = outputDir - override var dokkaPlugins = super.dokkaPlugins + javadocDependency - override fun execute() { super.execute() if (!File(outputDir).exists()) { -- cgit