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`

---
 .../kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt            | 3 +--
 integration-tests/gradle/projects/it-basic/build.gradle.kts            | 2 +-
 .../kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt | 2 +-
 integration-tests/maven/projects/it-maven/pom.xml                      | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'integration-tests')

diff --git a/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt b/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt
index 6510c044..aabc30c1 100644
--- a/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt
+++ b/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt
@@ -34,10 +34,9 @@ class CliIntegrationTest : AbstractCliIntegrationTest() {
             "java", "-jar", cliJarFile.path,
             "-outputDir", dokkaOutputDir.path,
             "-pluginsClasspath", basePluginJarFile.path,
+            "-moduleName", "Basic Project",
             "-sourceSet",
             buildString {
-                append(" -moduleName it-cli")
-                append(" -moduleDisplayName CLI-Example")
                 append(" -sourceSetName cliMain")
                 append(" -src ${File(projectDir, "src").path}")
                 append(" -jdkVersion 8")
diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts
index 21187561..2769677f 100644
--- a/integration-tests/gradle/projects/it-basic/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts
@@ -15,9 +15,9 @@ dependencies {
 }
 
 tasks.withType<DokkaTask> {
+    moduleName.set("Basic Project")
     dokkaSourceSets {
         configureEach {
-            moduleDisplayName.set("Basic Project")
             suppressedFiles.from(file("src/main/kotlin/it/suppressedByPath"))
             perPackageOption {
                 prefix.set("it.suppressedByPackage")
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt
index 1265d675..f3bcfd59 100644
--- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt
+++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt
@@ -84,7 +84,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac
 
         assertTrue(
             allHtmlFiles().any { file -> "Basic Project" in file.readText() },
-            "Expected configured moduleDisplayName to be present in html"
+            "Expected configured moduleName to be present in html"
         )
 
         assertTrue(
diff --git a/integration-tests/maven/projects/it-maven/pom.xml b/integration-tests/maven/projects/it-maven/pom.xml
index 350701f9..80620c82 100644
--- a/integration-tests/maven/projects/it-maven/pom.xml
+++ b/integration-tests/maven/projects/it-maven/pom.xml
@@ -91,7 +91,7 @@
                     <skip>false</skip>
 
                     <!-- Default: ${project.artifactId} -->
-                    <moduleDisplayName>Maven Integration Test Module</moduleDisplayName>
+                    <moduleName>Maven Integration Test Module</moduleName>
 
                     <!-- Default: ${project.basedir}/target/dokka -->
                     <outputDir>${project.basedir}/output</outputDir>
-- 
cgit