Fix building of dokka multiproject. This also means dokka is no longer

universally applied, but still auto-configured by the project plugin.

Author: pdvrieze

benchmark/build.gradle.kts

@@ -1,5 +1,3 @@
-import net.devrieze.gradle.ext.addNativeTargets
-
 /*
  * Copyright (c) 2024.
  *
@@ -26,7 +24,7 @@ plugins {
     id("projectPlugin")
     alias(libs.plugins.kotlinSerialization)
     alias(libs.plugins.allopen)
-    alias(libs.plugins.dokka)
+//    alias(libs.plugins.dokka)
 //    alias(libs.plugins.jmh)
     signing
 }

build.gradle.kts

@@ -18,21 +18,11 @@
  * under the License.
  */
 
-import net.devrieze.gradle.ext.configureDokka
-import net.devrieze.gradle.ext.envAndroid
-import net.devrieze.gradle.ext.envJvm
 import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
 import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
-import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
-import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
-import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
     repositories {
@@ -114,3 +104,6 @@ idea {
         contentRoot = projectDir
     }
 }
+
+tasks.withType<DokkaMultiModuleTask>().configureEach {
+}

core/base/build.gradle.kts

@@ -30,12 +30,12 @@ import org.jetbrains.kotlin.gradle.dsl.JsSourceMapEmbedMode
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
+    alias(libs.plugins.dokka)
     id("projectPlugin")
     kotlin("multiplatform")
     alias(libs.plugins.kotlinSerialization)
     `maven-publish`
     signing
-    alias(libs.plugins.dokka)
     idea
     alias(libs.plugins.binaryValidator)
 }

core/compat/build.gradle.kts

@@ -25,11 +25,11 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions
 
 plugins {
+    alias(libs.plugins.dokka)
     id("projectPlugin")
     kotlin("multiplatform")
     `maven-publish`
     signing
-    alias(libs.plugins.dokka)
     idea
 }
 

project-plugins/src/main/kotlin/io/github/xmlutil/plugin/ProjectPlugin.kt

@@ -186,10 +186,13 @@ class ProjectPlugin: Plugin<Project> {
                     }
 
                 }
+
+                is DokkaPlugin -> {
+                    project.logger.info("Automatically configuring dokka from the project plugin for ${project.name}")
+                    project.configureDokka(e.dokkaModuleName, e.dokkaVersion)
+                }
             }
         }
-        project.plugins.apply(DokkaPlugin::class.java)
-        project.configureDokka(e.dokkaModuleName, e.dokkaVersion)
     }
 
     private fun KotlinCommonCompilerOptions.configureCompilerOptions(project: Project, name: String) {

project-plugins/src/main/kotlin/net/devrieze/gradle/ext/dokka.kt

@@ -24,7 +24,7 @@ import org.gradle.api.Project
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.withType
-import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
+import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.dokka.gradle.GradleDokkaSourceSetBuilder
 import java.net.URI
 import java.net.URL
@@ -34,7 +34,7 @@ fun Project.configureDokka(
     myModuleVersion: Provider<String>
 ) {
     logger.info("Configuring dokka for project($name)")
-    tasks.withType<AbstractDokkaLeafTask> {
+    tasks.withType<DokkaTask>() {
         moduleName.convention(myModuleName)
         moduleVersion.convention(myModuleVersion)
 

schemaTests/build.gradle.kts

@@ -24,8 +24,8 @@ plugins {
     kotlin("multiplatform")
     id("projectPlugin")
     alias(libs.plugins.kotlinSerialization)
-    alias(libs.plugins.dokka)
-    signing
+//    alias(libs.plugins.dokka)
+//    signing
 }
 
 base {