From 8cd28416817dfd7d28bb66b28e849d97cc09012b Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Thu, 27 Aug 2020 15:50:40 +0200
Subject: Let module name be configurable withing `AbstractDokkaTask` and
 remove concept of `moduleDisplayName`

---
 runners/maven-plugin/src/main/kotlin/DokkaMojo.kt | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'runners/maven-plugin/src/main')

diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
index b95b94c0..4e5e053a 100644
--- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
+++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
@@ -101,9 +101,6 @@ abstract class AbstractDokkaMojo(private val defaultDokkaPlugins: List<Dependenc
     @Parameter(required = true, defaultValue = "\${project.artifactId}")
     var moduleName: String = ""
 
-    @Parameter
-    var moduleDisplayName: String = ""
-
     @Parameter(required = false, defaultValue = "false")
     var skip: Boolean = false
 
@@ -190,7 +187,6 @@ abstract class AbstractDokkaMojo(private val defaultDokkaPlugins: List<Dependenc
         }
 
         val sourceSet = DokkaSourceSetImpl(
-            moduleDisplayName = moduleDisplayName.takeIf(String::isNotBlank) ?: moduleName,
             displayName = displayName,
             sourceSetID = DokkaSourceSetID(moduleName, sourceSetName),
             classpath = classpath.map(::File),
@@ -229,12 +225,11 @@ abstract class AbstractDokkaMojo(private val defaultDokkaPlugins: List<Dependenc
         val logger = MavenDokkaLogger(log)
 
         val configuration = DokkaConfigurationImpl(
+            moduleName = moduleName,
             outputDir = File(getOutDir()),
             offlineMode = offlineMode,
             cacheRoot = cacheRoot?.let(::File),
-            sourceSets = listOf(sourceSet).also {
-                if (sourceSet.moduleDisplayName.isEmpty()) logger.warn("Not specified module name. It can result in unexpected behaviour while including documentation for module")
-            },
+            sourceSets = listOf(sourceSet),
             pluginsClasspath = getArtifactByAether("org.jetbrains.dokka", "dokka-base", dokkaVersion) +
                     dokkaPlugins.map { getArtifactByAether(it.groupId, it.artifactId, it.version ?: dokkaVersion) }
                         .flatten(),
-- 
cgit