diff --git a/dokka-runners/dokka-gradle-plugin/api/dokka-gradle-plugin.api b/dokka-runners/dokka-gradle-plugin/api/dokka-gradle-plugin.api index 013f439567..8c30ef558f 100644 --- a/dokka-runners/dokka-gradle-plugin/api/dokka-gradle-plugin.api +++ b/dokka-runners/dokka-gradle-plugin/api/dokka-gradle-plugin.api @@ -83,7 +83,6 @@ public abstract class org/jetbrains/dokka/gradle/DokkaExtension : java/io/Serial public abstract fun getDokkaCacheDirectory ()Lorg/gradle/api/file/DirectoryProperty; public abstract fun getDokkaEngineVersion ()Lorg/gradle/api/provider/Property; public abstract fun getDokkaGeneratorIsolation ()Lorg/gradle/api/provider/Property; - public abstract fun getDokkaModuleDirectory ()Lorg/gradle/api/file/DirectoryProperty; public final fun getDokkaPublicationDirectory ()Lorg/gradle/api/file/DirectoryProperty; public final fun getDokkaPublications ()Lorg/gradle/api/NamedDomainObjectContainer; public final fun getDokkaSourceSets ()Lorg/gradle/api/NamedDomainObjectContainer; diff --git a/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaBasePlugin.kt b/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaBasePlugin.kt index 2e6e3dbb45..f5ad2c37df 100644 --- a/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaBasePlugin.kt +++ b/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaBasePlugin.kt @@ -101,7 +101,7 @@ constructor( sourceSetScopeDefault.convention(project.path) basePublicationsDirectory.convention(layout.buildDirectory.dir("dokka")) - dokkaModuleDirectory.convention(layout.buildDirectory.dir("dokka-module")) + baseModulesDirectory.convention(layout.buildDirectory.dir("dokka-module")) // @Suppress("DEPRECATION") // dokkaConfigurationsDirectory.convention(layout.buildDirectory.dir("dokka-config")) @@ -158,7 +158,7 @@ constructor( moduleVersion.convention(dokkaExtension.moduleVersion) offlineMode.convention(false) outputDirectory.convention(dokkaExtension.basePublicationsDirectory.dir(formatName)) - moduleOutputDirectory.convention(dokkaExtension.dokkaModuleDirectory.dir(formatName)) + moduleOutputDirectory.convention(dokkaExtension.baseModulesDirectory.dir(formatName)) suppressInheritedMembers.convention( @Suppress("DEPRECATION") dokkaExtension.suppressInheritedMembers diff --git a/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaExtension.kt b/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaExtension.kt index 34b56608de..87faaeee1c 100644 --- a/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaExtension.kt +++ b/dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaExtension.kt @@ -57,7 +57,7 @@ constructor( * Note that Dokka Modules are intermediate products and must be combined into a completed * Dokka Publication. They are not intended to be comprehensible in isolation. */ - abstract val dokkaModuleDirectory: DirectoryProperty + internal abstract val baseModulesDirectory: DirectoryProperty /** Default Dokka Gradle Plugin cache directory */ abstract val dokkaCacheDirectory: DirectoryProperty