Relocate DGPv2 'dokka' package (#3779)

* KT-70811 Relocate DGPv2 'dokka' package

Relocate the `org.jetbrains.dokka.gradle.dokka` package to avoid 'dokka' appearing twice in the package name.

- `org.jetbrains.dokka.gradle.engine` contains code for interoping with the Dokka Engine
- `DokkaPublication` was moved to `org.jetbrains.dokka.gradle.formats`, since it controls the publication of a format.

dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaBasePlugin.kt

@@ -24,9 +24,9 @@ import org.jetbrains.dokka.gradle.dependencies.BaseDependencyManager
 import org.jetbrains.dokka.gradle.dependencies.DokkaAttribute.Companion.DokkaClasspathAttribute
 import org.jetbrains.dokka.gradle.dependencies.DokkaAttribute.Companion.DokkaFormatAttribute
 import org.jetbrains.dokka.gradle.dependencies.DokkaAttribute.Companion.DokkaModuleComponentAttribute
-import org.jetbrains.dokka.gradle.dokka.parameters.DokkaSourceSetSpec
-import org.jetbrains.dokka.gradle.dokka.parameters.KotlinPlatform
-import org.jetbrains.dokka.gradle.dokka.parameters.VisibilityModifier
+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

dokka-runners/dokka-gradle-plugin/src/main/kotlin/DokkaExtension.kt

@@ -13,8 +13,8 @@ import org.gradle.api.tasks.Nested
 import org.gradle.kotlin.dsl.newInstance
 import org.gradle.workers.WorkerExecutor
 import org.jetbrains.dokka.gradle.dependencies.BaseDependencyManager
-import org.jetbrains.dokka.gradle.dokka.DokkaPublication
-import org.jetbrains.dokka.gradle.dokka.parameters.DokkaSourceSetSpec
+import org.jetbrains.dokka.gradle.formats.DokkaPublication
+import org.jetbrains.dokka.gradle.engine.parameters.DokkaSourceSetSpec
 import org.jetbrains.dokka.gradle.internal.*
 import org.jetbrains.dokka.gradle.workers.ClassLoaderIsolation
 import org.jetbrains.dokka.gradle.workers.ProcessIsolation

dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/AndroidAdapter.kt

@@ -20,7 +20,7 @@ import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.dokka.gradle.DokkaBasePlugin
 import org.jetbrains.dokka.gradle.DokkaExtension
-import org.jetbrains.dokka.gradle.dokka.parameters.KotlinPlatform
+import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
 import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
 import org.jetbrains.dokka.gradle.internal.PluginId
 import org.jetbrains.dokka.gradle.internal.artifactType

dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/JavaAdapter.kt

@@ -18,8 +18,8 @@ import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.dokka.gradle.DokkaExtension
-import org.jetbrains.dokka.gradle.dokka.parameters.DokkaSourceSetSpec
-import org.jetbrains.dokka.gradle.dokka.parameters.KotlinPlatform
+import org.jetbrains.dokka.gradle.engine.parameters.DokkaSourceSetSpec
+import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
 import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
 import org.jetbrains.dokka.gradle.internal.PluginId
 import org.jetbrains.dokka.gradle.internal.or

dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/KotlinAdapter.kt

@@ -20,10 +20,10 @@ import org.gradle.kotlin.dsl.*
 import org.jetbrains.dokka.gradle.DokkaBasePlugin
 import org.jetbrains.dokka.gradle.DokkaExtension
 import org.jetbrains.dokka.gradle.adapters.KotlinAdapter.Companion.currentKotlinToolingVersion
-import org.jetbrains.dokka.gradle.dokka.parameters.SourceSetIdSpec
-import org.jetbrains.dokka.gradle.dokka.parameters.SourceSetIdSpec.Companion.dokkaSourceSetIdSpec
-import org.jetbrains.dokka.gradle.dokka.parameters.DokkaSourceSetSpec
-import org.jetbrains.dokka.gradle.dokka.parameters.KotlinPlatform
+import org.jetbrains.dokka.gradle.engine.parameters.SourceSetIdSpec
+import org.jetbrains.dokka.gradle.engine.parameters.SourceSetIdSpec.Companion.dokkaSourceSetIdSpec
+import org.jetbrains.dokka.gradle.engine.parameters.DokkaSourceSetSpec
+import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
 import org.jetbrains.dokka.gradle.internal.*
 import org.jetbrains.kotlin.commonizer.KonanDistribution
 import org.jetbrains.kotlin.commonizer.platformLibsDir

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dependencies/FormatDependenciesManager.kt

@@ -200,7 +200,7 @@ class FormatDependenciesManager(
      * - module output directory
      * - module includes directory
      *
-     * @see org.jetbrains.dokka.gradle.dokka.parameters.DokkaModuleDescriptionKxs
+     * @see org.jetbrains.dokka.gradle.engine.parameters.DokkaModuleDescriptionKxs
      * @see org.jetbrains.dokka.DokkaConfiguration.DokkaModuleDescription.sourceOutputDirectory
      */
     val moduleOutputDirectories: ModuleComponentDependencies =

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/DokkaExternalDocumentationLinkSpec.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/DokkaExternalDocumentationLinkSpec.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import org.gradle.api.Named
 import org.gradle.api.provider.Property
@@ -111,9 +111,9 @@ constructor(
      *
      * Defaults to `true`.
      *
-     * @see org.jetbrains.dokka.gradle.dokka.parameters.DokkaSourceSetSpec.enableKotlinStdLibDocumentationLink
-     * @see org.jetbrains.dokka.gradle.dokka.parameters.DokkaSourceSetSpec.enableJdkDocumentationLink
-     * @see org.jetbrains.dokka.gradle.dokka.parameters.DokkaSourceSetSpec.enableAndroidDocumentationLink
+     * @see org.jetbrains.dokka.gradle.engine.parameters.DokkaSourceSetSpec.enableKotlinStdLibDocumentationLink
+     * @see org.jetbrains.dokka.gradle.engine.parameters.DokkaSourceSetSpec.enableJdkDocumentationLink
+     * @see org.jetbrains.dokka.gradle.engine.parameters.DokkaSourceSetSpec.enableAndroidDocumentationLink
      */
     @get:Input
     abstract val enabled: Property<Boolean>

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/DokkaGeneratorParametersSpec.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/DokkaGeneratorParametersSpec.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.file.ConfigurableFileCollection
@@ -27,7 +27,7 @@ constructor(
     objects: ObjectFactory,
     /**
      * Configurations for Dokka Generator Plugins. Must be provided from
-     * [org.jetbrains.dokka.gradle.dokka.DokkaPublication.pluginsConfiguration].
+     * [org.jetbrains.dokka.gradle.formats.DokkaPublication.pluginsConfiguration].
      */
     @get:Nested
     val pluginsConfiguration: DokkaPluginParametersContainer,
@@ -69,7 +69,7 @@ constructor(
     /**
      * Classpath that contains the Dokka Generator Plugins used to modify this publication.
      *
-     * The plugins should be configured in [org.jetbrains.dokka.gradle.dokka.DokkaPublication.pluginsConfiguration].
+     * The plugins should be configured in [org.jetbrains.dokka.gradle.formats.DokkaPublication.pluginsConfiguration].
      */
     @get:InputFiles
     @get:Classpath

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/DokkaModuleDescriptionKxs.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/DokkaModuleDescriptionKxs.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import kotlinx.serialization.Serializable
 import org.gradle.kotlin.dsl.java
@@ -20,7 +20,7 @@ import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
  *
  * All other configuration data classes also implement [java.io.Serializable] via their parent interfaces.
  *
- * @see org.jetbrains.dokka.gradle.dokka.parameters.DokkaModuleDescriptionKxs
+ * @see org.jetbrains.dokka.gradle.engine.parameters.DokkaModuleDescriptionKxs
  * @see org.jetbrains.dokka.DokkaModuleDescriptionImpl
  */
 @Serializable

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/DokkaPackageOptionsSpec.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/DokkaPackageOptionsSpec.kt

@@ -3,7 +3,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/DokkaSourceLinkSpec.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/DokkaSourceLinkSpec.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.ProjectLayout

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/DokkaSourceSetSpec.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/DokkaSourceSetSpec.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import org.gradle.api.Action
 import org.gradle.api.DomainObjectSet
@@ -16,7 +16,7 @@ import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.*
 import org.gradle.kotlin.dsl.java
 import org.gradle.kotlin.dsl.newInstance
-import org.jetbrains.dokka.gradle.dokka.parameters.SourceSetIdSpec.Companion.dokkaSourceSetIdSpec
+import org.jetbrains.dokka.gradle.engine.parameters.SourceSetIdSpec.Companion.dokkaSourceSetIdSpec
 import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
 import org.jetbrains.dokka.gradle.internal.adding
 import org.jetbrains.dokka.gradle.internal.domainObjectContainer

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/HasConfigurableVisibilityModifiers.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/HasConfigurableVisibilityModifiers.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.Input

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/KotlinPlatform.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/KotlinPlatform.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import org.jetbrains.dokka.Platform
 

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/SourceSetIdSpec.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/SourceSetIdSpec.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import org.gradle.api.Named
 import org.gradle.api.model.ObjectFactory

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/VisibilityModifier.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/VisibilityModifier.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters
+package org.jetbrains.dokka.gradle.engine.parameters
 
 import org.jetbrains.dokka.DokkaConfiguration
 

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/builders/DokkaParametersBuilder.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/builders/DokkaParametersBuilder.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters.builders
+package org.jetbrains.dokka.gradle.engine.parameters.builders
 
 import org.gradle.api.Project
 import org.gradle.api.file.ArchiveOperations
@@ -10,9 +10,9 @@ import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.jetbrains.dokka.*
 import org.jetbrains.dokka.gradle.DokkaBasePlugin
-import org.jetbrains.dokka.gradle.dokka.parameters.DokkaGeneratorParametersSpec
-import org.jetbrains.dokka.gradle.dokka.parameters.DokkaModuleDescriptionKxs
-import org.jetbrains.dokka.gradle.dokka.plugins.DokkaPluginParametersBaseSpec
+import org.jetbrains.dokka.gradle.engine.parameters.DokkaGeneratorParametersSpec
+import org.jetbrains.dokka.gradle.engine.parameters.DokkaModuleDescriptionKxs
+import org.jetbrains.dokka.gradle.engine.plugins.DokkaPluginParametersBaseSpec
 import org.jetbrains.dokka.gradle.formats.DokkaHtmlPlugin.Companion.extractDokkaPluginMarkers
 import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
 import java.io.File

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/parameters/builders/DokkaSourceSetBuilder.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/builders/DokkaSourceSetBuilder.kt

@@ -1,14 +1,14 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.parameters.builders
+package org.jetbrains.dokka.gradle.engine.parameters.builders
 
 
 import org.gradle.api.logging.Logging
 import org.jetbrains.dokka.*
-import org.jetbrains.dokka.gradle.dokka.parameters.*
-import org.jetbrains.dokka.gradle.dokka.parameters.KotlinPlatform.Companion.dokkaType
-import org.jetbrains.dokka.gradle.dokka.parameters.VisibilityModifier.Companion.dokkaType
+import org.jetbrains.dokka.gradle.engine.parameters.*
+import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform.Companion.dokkaType
+import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier.Companion.dokkaType
 import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
 import org.jetbrains.dokka.gradle.internal.mapNotNullToSet
 import org.jetbrains.dokka.gradle.internal.mapToSet

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/plugins/DokkaHtmlPluginParameters.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/plugins/DokkaHtmlPluginParameters.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.plugins
+package org.jetbrains.dokka.gradle.engine.plugins
 
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.putJsonArray

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/plugins/DokkaPluginParametersBaseSpec.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/plugins/DokkaPluginParametersBaseSpec.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.plugins
+package org.jetbrains.dokka.gradle.engine.plugins
 
 import org.gradle.api.Named
 import org.gradle.api.tasks.Input

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/plugins/DokkaPluginParametersBuilder.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/plugins/DokkaPluginParametersBuilder.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.plugins
+package org.jetbrains.dokka.gradle.engine.plugins
 
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/plugins/DokkaVersioningPluginParameters.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/plugins/DokkaVersioningPluginParameters.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka.plugins
+package org.jetbrains.dokka.gradle.engine.plugins
 
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.putJsonArray

dokka-runners/dokka-gradle-plugin/src/main/kotlin/formats/DokkaFormatTasks.kt

@@ -8,15 +8,14 @@ import org.gradle.api.provider.ProviderFactory
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.register
 import org.jetbrains.dokka.gradle.dependencies.FormatDependenciesManager
-import org.jetbrains.dokka.gradle.dokka.DokkaPublication
 import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
 import org.jetbrains.dokka.gradle.internal.configuring
 import org.jetbrains.dokka.gradle.tasks.DokkaGenerateModuleTask
 import org.jetbrains.dokka.gradle.tasks.DokkaGeneratePublicationTask
 import org.jetbrains.dokka.gradle.tasks.DokkaGenerateTask
 import org.jetbrains.dokka.gradle.tasks.TaskNames
 
-/** Tasks for generating a Dokka Publication in a specific format. */
+/** Tasks for generating a [DokkaPublication] in a specific format. */
 @DokkaInternalApi
 class DokkaFormatTasks(
     project: Project,

dokka-runners/dokka-gradle-plugin/src/main/kotlin/formats/DokkaHtmlPlugin.kt

@@ -11,10 +11,10 @@ import org.gradle.api.provider.ProviderFactory
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.registerBinding
 import org.gradle.kotlin.dsl.withType
-import org.jetbrains.dokka.gradle.dokka.plugins.DokkaHtmlPluginParameters
-import org.jetbrains.dokka.gradle.dokka.plugins.DokkaHtmlPluginParameters.Companion.DOKKA_HTML_PARAMETERS_NAME
-import org.jetbrains.dokka.gradle.dokka.plugins.DokkaVersioningPluginParameters
-import org.jetbrains.dokka.gradle.dokka.plugins.DokkaVersioningPluginParameters.Companion.DOKKA_VERSIONING_PLUGIN_PARAMETERS_NAME
+import org.jetbrains.dokka.gradle.engine.plugins.DokkaHtmlPluginParameters
+import org.jetbrains.dokka.gradle.engine.plugins.DokkaHtmlPluginParameters.Companion.DOKKA_HTML_PARAMETERS_NAME
+import org.jetbrains.dokka.gradle.engine.plugins.DokkaVersioningPluginParameters
+import org.jetbrains.dokka.gradle.engine.plugins.DokkaVersioningPluginParameters.Companion.DOKKA_VERSIONING_PLUGIN_PARAMETERS_NAME
 import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
 import org.jetbrains.dokka.gradle.internal.rootProjectName
 import org.jetbrains.dokka.gradle.internal.uppercaseFirstChar

dokka-runners/dokka-gradle-plugin/src/main/kotlin/dokka/DokkaPublication.kt → dokka-runners/dokka-gradle-plugin/src/main/kotlin/formats/DokkaPublication.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package org.jetbrains.dokka.gradle.dokka
+package org.jetbrains.dokka.gradle.formats
 
 import org.gradle.api.Named
 import org.gradle.api.file.ConfigurableFileCollection
@@ -15,12 +15,11 @@ import java.io.Serializable
 import javax.inject.Inject
 
 /**
- * A [DokkaPublication] describes a single Dokka output.
+ * A [DokkaPublication] controls the output running the Dokka Generator.
  *
- * Each Publication has its own set of Gradle tasks and [org.gradle.api.artifacts.Configuration]s.
+ * The output format (for example, HTML) is determined by the Dokka Plugins that are present.
  *
- * The type of site is determined by the Dokka Plugins. By default, an HTML site will be generated.
- * By default, Dokka will create publications for HTML, Jekyll, and GitHub Flavoured Markdown.
+ * Each Dokka Publication has its own set of Gradle tasks and [org.gradle.api.artifacts.Configuration]s.
  */
 abstract class DokkaPublication
 @DokkaInternalApi

dokka-runners/dokka-gradle-plugin/src/main/kotlin/internal/gradleTypealiases.kt

@@ -4,7 +4,7 @@
 package org.jetbrains.dokka.gradle.internal
 
 import org.gradle.api.ExtensiblePolymorphicDomainObjectContainer
-import org.jetbrains.dokka.gradle.dokka.plugins.DokkaPluginParametersBaseSpec
+import org.jetbrains.dokka.gradle.engine.plugins.DokkaPluginParametersBaseSpec
 
 /** Container for all [Dokka Plugin parameters][DokkaPluginParametersBaseSpec]. */
 typealias DokkaPluginParametersContainer =

dokka-runners/dokka-gradle-plugin/src/main/kotlin/internal/gradleUtils.kt

@@ -24,7 +24,7 @@ import org.gradle.api.specs.Spec
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.*
 import org.gradle.util.GradleVersion
-import org.jetbrains.dokka.gradle.dokka.plugins.DokkaPluginParametersBaseSpec
+import org.jetbrains.dokka.gradle.engine.plugins.DokkaPluginParametersBaseSpec
 import kotlin.reflect.KClass
 import kotlin.reflect.jvm.jvmName
 

dokka-runners/dokka-gradle-plugin/src/main/kotlin/tasks/DokkaGenerateModuleTask.kt

@@ -12,7 +12,7 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
 import org.gradle.workers.WorkerExecutor
 import org.jetbrains.dokka.gradle.DokkaBasePlugin
-import org.jetbrains.dokka.gradle.dokka.parameters.DokkaModuleDescriptionKxs
+import org.jetbrains.dokka.gradle.engine.parameters.DokkaModuleDescriptionKxs
 import org.jetbrains.dokka.gradle.internal.DokkaPluginParametersContainer
 import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
 import java.io.File
@@ -36,7 +36,7 @@ constructor(
     private val fs: FileSystemOperations,
     /**
      * Configurations for Dokka Generator Plugins. Must be provided from
-     * [org.jetbrains.dokka.gradle.dokka.DokkaPublication.pluginsConfiguration].
+     * [org.jetbrains.dokka.gradle.formats.DokkaPublication.pluginsConfiguration].
      */
     pluginsConfiguration: DokkaPluginParametersContainer,
 ) : DokkaGenerateTask(

dokka-runners/dokka-gradle-plugin/src/main/kotlin/tasks/DokkaGeneratePublicationTask.kt

@@ -32,7 +32,7 @@ constructor(
     private val fs: FileSystemOperations,
     /**
      * Configurations for Dokka Generator Plugins. Must be provided from
-     * [org.jetbrains.dokka.gradle.dokka.DokkaPublication.pluginsConfiguration].
+     * [org.jetbrains.dokka.gradle.formats.DokkaPublication.pluginsConfiguration].
      */
     pluginsConfiguration: DokkaPluginParametersContainer,
 ) : DokkaGenerateTask(