Remove the dependency of dokkaGenerate on dokkaGenerateModule* (#…

…3920) Co-authored-by: Adam Semenenko <[email protected]>
Kotlin · Nov 22, 2024 · 659f955 · 659f955
1 parent 0c87119
commit 659f955
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 17 deletions.
diff --git a/dokka-integration-tests/gradle/src/test/kotlin/AndroidComposeIT.kt b/dokka-integration-tests/gradle/src/test/kotlin/AndroidComposeIT.kt
@@ -93,7 +93,6 @@ class AndroidComposeIT {
                 withClue("expect dokkaGenerate runs successfully") {
                     shouldHaveTask(":dokkaGenerate").shouldHaveOutcome(UP_TO_DATE, SUCCESS)
                     shouldHaveTask(":dokkaGeneratePublicationHtml").shouldHaveOutcome(FROM_CACHE, SUCCESS)
-                    shouldHaveTask(":dokkaGenerateModuleHtml").shouldHaveOutcome(FROM_CACHE, SUCCESS)
                 }
             }
 
@@ -118,7 +117,6 @@ class AndroidComposeIT {
                 }
                 withClue("expect dokkaGenerate* work tasks are loaded from cache") {
                     shouldHaveTask(":dokkaGeneratePublicationHtml").shouldHaveOutcome(FROM_CACHE)
-                    shouldHaveTask(":dokkaGenerateModuleHtml").shouldHaveOutcome(FROM_CACHE)
                 }
             }
     }

diff --git a/dokka-integration-tests/gradle/src/test/kotlin/AndroidProjectIT.kt b/dokka-integration-tests/gradle/src/test/kotlin/AndroidProjectIT.kt
@@ -100,7 +100,6 @@ class AndroidProjectIT {
                 withClue("expect dokkaGenerate runs successfully") {
                     shouldHaveTask(":dokkaGenerate").shouldHaveOutcome(UP_TO_DATE, SUCCESS)
                     shouldHaveTask(":dokkaGeneratePublicationHtml").shouldHaveOutcome(FROM_CACHE, SUCCESS)
-                    shouldHaveTask(":dokkaGenerateModuleHtml").shouldHaveOutcome(FROM_CACHE, SUCCESS)
                 }
             }
 
@@ -125,7 +124,6 @@ class AndroidProjectIT {
                 }
                 withClue("expect dokkaGenerate* work tasks are loaded from cache") {
                     shouldHaveTask(":dokkaGeneratePublicationHtml").shouldHaveOutcome(FROM_CACHE)
-                    shouldHaveTask(":dokkaGenerateModuleHtml").shouldHaveOutcome(FROM_CACHE)
                 }
             }
     }

diff --git a/dokka-integration-tests/gradle/src/testExampleProjects/kotlin/ExampleProjectsTest.kt b/dokka-integration-tests/gradle/src/testExampleProjects/kotlin/ExampleProjectsTest.kt
@@ -269,7 +269,6 @@ class ExampleProjectsTest {
                     ExampleProject.Javadoc -> {
                         shouldHaveTasksWithOutcome(
                             ":dokkaGeneratePublicationJavadoc" to FROM_CACHE,
-                            ":dokkaGenerateModuleJavadoc" to FROM_CACHE,
                             ":dokkaGenerate" to UP_TO_DATE,
                         )
                     }
@@ -285,7 +284,6 @@ class ExampleProjectsTest {
 
                     ExampleProject.Multimodule -> {
                         shouldHaveTasksWithOutcome(
-                            ":docs:dokkaGenerateModuleHtml" to FROM_CACHE,
                             ":childProjectA:dokkaGenerateModuleHtml" to FROM_CACHE,
                             ":childProjectB:dokkaGenerateModuleHtml" to FROM_CACHE,
                             ":docs:dokkaGeneratePublicationHtml" to FROM_CACHE,
@@ -295,7 +293,6 @@ class ExampleProjectsTest {
 
                     ExampleProject.VersioningMultimodule -> {
                         shouldHaveTasksWithOutcome(
-                            ":docs:dokkaGenerateModuleHtml" to FROM_CACHE,
                             ":childProjectA:dokkaGenerateModuleHtml" to FROM_CACHE,
                             ":childProjectB:dokkaGenerateModuleHtml" to FROM_CACHE,
                             ":docs:dokkaGeneratePublicationHtml" to FROM_CACHE,
@@ -306,7 +303,6 @@ class ExampleProjectsTest {
                     else -> {
                         shouldHaveTasksWithOutcome(
                             ":dokkaGeneratePublicationHtml" to FROM_CACHE,
-                            ":dokkaGenerateModuleHtml" to FROM_CACHE,
                             ":dokkaGenerate" to UP_TO_DATE,
                         )
                     }

diff --git a/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaBasePlugin.kt b/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaBasePlugin.kt
@@ -28,10 +28,7 @@ import org.jetbrains.dokka.gradle.engine.parameters.DokkaSourceSetSpec
 import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
 import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
 import org.jetbrains.dokka.gradle.internal.*
-import org.jetbrains.dokka.gradle.tasks.DokkaBaseTask
-import org.jetbrains.dokka.gradle.tasks.DokkaGenerateModuleTask
-import org.jetbrains.dokka.gradle.tasks.DokkaGenerateTask
-import org.jetbrains.dokka.gradle.tasks.TaskNames
+import org.jetbrains.dokka.gradle.tasks.*
 import java.io.File
 import javax.inject.Inject
 
@@ -268,7 +265,7 @@ constructor(
     ) {
         target.tasks.register<DokkaBaseTask>(taskNames.generate) {
             description = "Generates Dokka publications for all formats"
-            dependsOn(target.tasks.withType<DokkaGenerateTask>())
+            dependsOn(target.tasks.withType<DokkaGeneratePublicationTask>())
         }
 
         target.tasks.withType<DokkaGenerateTask>().configureEach {

diff --git a/dokka-runners/dokka-gradle-plugin/src/testFunctional/kotlin/MultiModuleFunctionalTest.kt b/dokka-runners/dokka-gradle-plugin/src/testFunctional/kotlin/MultiModuleFunctionalTest.kt
@@ -146,7 +146,7 @@ class MultiModuleFunctionalTest : FunSpec({
                         test("expect build is successful") {
                             output shouldContainAll listOf(
                                 "BUILD SUCCESSFUL",
-                                "8 actionable tasks: 8 up-to-date",
+                                "6 actionable tasks: 6 up-to-date",
                             )
                         }
 
@@ -496,9 +496,6 @@ class MultiModuleFunctionalTest : FunSpec({
                             "> Task :dokkaGeneratePublicationHtml",
                             "> Task :dokkaGeneratePublicationJavadoc",
 
-                            "> Task :dokkaGenerateModuleHtml",
-                            "> Task :dokkaGenerateModuleJavadoc",
-
                             "> Task :subproject-hello:dokkaGenerateModuleHtml",
                             "> Task :subproject-hello:dokkaGenerateModuleJavadoc",