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`

---
 core/src/main/kotlin/configuration.kt              | 8 +++++---
 core/src/main/kotlin/defaultConfiguration.kt       | 4 ++--
 core/src/main/kotlin/model/CompositeSourceSetID.kt | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'core/src/main')

diff --git a/core/src/main/kotlin/configuration.kt b/core/src/main/kotlin/configuration.kt
index 2aa252e1..9a1ff602 100644
--- a/core/src/main/kotlin/configuration.kt
+++ b/core/src/main/kotlin/configuration.kt
@@ -9,6 +9,7 @@ import java.io.Serializable
 import java.net.URL
 
 object DokkaDefaults {
+    val moduleName: String = "root"
     val outputDir = File("./dokka")
     const val format: String = "html"
     val cacheRoot: File? = null
@@ -58,12 +59,13 @@ interface DokkaConfigurationBuilder<T : Any> {
 
 fun <T : Any> Iterable<DokkaConfigurationBuilder<T>>.build(): List<T> = this.map { it.build() }
 
+
 data class DokkaSourceSetID(
-    val moduleName: String,
+    val scopeId: String,
     val sourceSetName: String
 ) : Serializable {
     override fun toString(): String {
-        return "$moduleName/$sourceSetName"
+        return "$scopeId/$sourceSetName"
     }
 }
 
@@ -72,6 +74,7 @@ fun DokkaConfigurationImpl(json: String): DokkaConfigurationImpl = parseJson(jso
 fun DokkaConfiguration.toJsonString(): String = toJsonString(this)
 
 interface DokkaConfiguration : Serializable {
+    val moduleName: String
     val outputDir: File
     val cacheRoot: File?
     val offlineMode: Boolean
@@ -84,7 +87,6 @@ interface DokkaConfiguration : Serializable {
     interface DokkaSourceSet : Serializable {
         val sourceSetID: DokkaSourceSetID
         val displayName: String
-        val moduleDisplayName: String
         val classpath: List<File>
         val sourceRoots: Set<File>
         val dependentSourceSets: Set<DokkaSourceSetID>
diff --git a/core/src/main/kotlin/defaultConfiguration.kt b/core/src/main/kotlin/defaultConfiguration.kt
index 8bd2d976..3fcc7aac 100644
--- a/core/src/main/kotlin/defaultConfiguration.kt
+++ b/core/src/main/kotlin/defaultConfiguration.kt
@@ -5,6 +5,7 @@ import java.io.File
 import java.net.URL
 
 data class DokkaConfigurationImpl(
+    override val moduleName: String = DokkaDefaults.moduleName,
     override val outputDir: File = DokkaDefaults.outputDir,
     override val cacheRoot: File? = DokkaDefaults.cacheRoot,
     override val offlineMode: Boolean = DokkaDefaults.offlineMode,
@@ -12,12 +13,11 @@ data class DokkaConfigurationImpl(
     override val pluginsClasspath: List<File> = emptyList(),
     override val pluginsConfiguration: Map<String, String> = emptyMap(),
     override val modules: List<DokkaModuleDescriptionImpl> = emptyList(),
-    override val failOnWarning: Boolean = DokkaDefaults.failOnWarning
+    override val failOnWarning: Boolean = DokkaDefaults.failOnWarning,
 ) : DokkaConfiguration
 
 
 data class DokkaSourceSetImpl(
-    override val moduleDisplayName: String,
     override val displayName: String = DokkaDefaults.sourceSetDisplayName,
     override val sourceSetID: DokkaSourceSetID,
     override val classpath: List<File> = emptyList(),
diff --git a/core/src/main/kotlin/model/CompositeSourceSetID.kt b/core/src/main/kotlin/model/CompositeSourceSetID.kt
index 3c1cf7de..9f38dafb 100644
--- a/core/src/main/kotlin/model/CompositeSourceSetID.kt
+++ b/core/src/main/kotlin/model/CompositeSourceSetID.kt
@@ -14,7 +14,7 @@ data class CompositeSourceSetID(
     }
 
     val merged = DokkaSourceSetID(
-        moduleName = children.map { it.moduleName }.reduce { acc, s -> "$acc+$s" },
+        scopeId = children.map { it.scopeId }.reduce { acc, s -> "$acc+$s" },
         sourceSetName = children.map { it.sourceSetName }.reduce { acc, s -> "$acc+$s" }
     )
 
-- 
cgit