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 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'core/src/main/kotlin/configuration.kt')

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>
-- 
cgit