From d83f08858ddec4769af48c4a0d3175123407ce01 Mon Sep 17 00:00:00 2001 From: IgnatBeresnev Date: Tue, 5 Sep 2023 17:31:41 +0200 Subject: [PATCH] Move dokka-core --- core/build.gradle.kts | 43 ------------------- {core => dokka-subprojects/core}/.gitignore | 0 {core => dokka-subprojects/core}/api/core.api | 0 dokka-subprojects/core/build.gradle.kts | 31 +++++++++++-- .../src/main/kotlin/ConfigurationJsonUtils.kt | 0 .../core}/src/main/kotlin/CoreExtensions.kt | 0 .../core}/src/main/kotlin/DokkaBootstrap.kt | 0 .../src/main/kotlin/DokkaBootstrapImpl.kt | 0 .../core}/src/main/kotlin/DokkaException.kt | 0 .../core}/src/main/kotlin/DokkaGenerator.kt | 0 .../core}/src/main/kotlin/DokkaVersion.kt | 0 .../core}/src/main/kotlin/InternalDokkaApi.kt | 0 .../core}/src/main/kotlin/configuration.kt | 0 .../src/main/kotlin/defaultConfiguration.kt | 0 .../src/main/kotlin/defaultExternalLinks.kt | 0 .../src/main/kotlin/generation/Generation.kt | 0 .../core}/src/main/kotlin/links/DRI.kt | 0 .../main/kotlin/model/CompositeSourceSetID.kt | 0 .../src/main/kotlin/model/DisplaySourceSet.kt | 0 .../src/main/kotlin/model/Documentable.kt | 0 .../core}/src/main/kotlin/model/JvmField.kt | 0 .../src/main/kotlin/model/WithChildren.kt | 0 .../src/main/kotlin/model/additionalExtras.kt | 0 .../src/main/kotlin/model/ancestryNode.kt | 0 .../core}/src/main/kotlin/model/classKinds.kt | 0 .../src/main/kotlin/model/defaultValues.kt | 0 .../core}/src/main/kotlin/model/doc/DocTag.kt | 0 .../kotlin/model/doc/DocumentationNode.kt | 0 .../src/main/kotlin/model/doc/TagWrapper.kt | 0 .../kotlin/model/documentableProperties.kt | 0 .../main/kotlin/model/documentableUtils.kt | 0 .../src/main/kotlin/model/extraModifiers.kt | 0 .../core}/src/main/kotlin/model/jvmName.kt | 0 .../model/properties/PropertyContainer.kt | 0 .../kotlin/model/properties/properties.kt | 0 .../src/main/kotlin/pages/ContentNodes.kt | 0 .../core}/src/main/kotlin/pages/PageNodes.kt | 0 .../core}/src/main/kotlin/pages/Pages.kt | 0 .../main/kotlin/pages/RendererSpecificPage.kt | 0 .../kotlin/pages/contentNodeProperties.kt | 0 .../core}/src/main/kotlin/pages/utils.kt | 0 .../main/kotlin/plugability/DokkaContext.kt | 0 .../kotlin/plugability/DokkaJavaPlugin.kt | 0 .../main/kotlin/plugability/DokkaPlugin.kt | 0 .../main/kotlin/plugability/LazyEvaluated.kt | 0 .../src/main/kotlin/plugability/extensions.kt | 0 .../src/main/kotlin/renderers/PostAction.kt | 0 .../src/main/kotlin/renderers/Renderer.kt | 0 .../documentation/DocumentableMerger.kt | 0 .../DocumentableToPageTranslator.kt | 0 .../documentation/DocumentableTransformer.kt | 0 .../PreMergeDocumentableTransformer.kt | 0 .../kotlin/transformers/pages/PageCreator.kt | 0 .../transformers/pages/PageTransformer.kt | 0 .../pages/PageTransformerBuilders.kt | 0 .../AsyncSourceToDocumentableTranslator.kt | 0 .../sources/SourceToDocumentableTranslator.kt | 0 .../src/main/kotlin/utilities/Collections.kt | 0 .../src/main/kotlin/utilities/DokkaLogging.kt | 0 .../core}/src/main/kotlin/utilities/Html.kt | 0 .../utilities/SelfRepresentingSingletonSet.kt | 0 .../main/kotlin/utilities/ServiceLocator.kt | 0 .../core}/src/main/kotlin/utilities/Uri.kt | 0 .../kotlin/utilities/associateWithNotNull.kt | 0 .../core}/src/main/kotlin/utilities/cast.kt | 0 .../core}/src/main/kotlin/utilities/json.kt | 0 .../utilities/parallelCollectionOperations.kt | 0 .../kotlin/validity/PreGenerationChecker.kt | 0 .../src/main/resources/META-INF/MANIFEST.MF | 0 .../META-INF/dokka/dokka-version.properties | 0 .../kotlin/model/CompositeSourceSetIDTest.kt | 0 .../test/kotlin/model/DisplaySourceSetTest.kt | 0 .../src/test/kotlin/model/DocumentableTest.kt | 0 .../utilities/DokkaConfigurationJsonTest.kt | 0 .../src/test/kotlin/utilities/JsonKtTest.kt | 0 75 files changed, 28 insertions(+), 46 deletions(-) delete mode 100644 core/build.gradle.kts rename {core => dokka-subprojects/core}/.gitignore (100%) rename {core => dokka-subprojects/core}/api/core.api (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/ConfigurationJsonUtils.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/CoreExtensions.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/DokkaBootstrap.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/DokkaBootstrapImpl.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/DokkaException.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/DokkaGenerator.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/DokkaVersion.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/InternalDokkaApi.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/configuration.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/defaultConfiguration.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/defaultExternalLinks.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/generation/Generation.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/links/DRI.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/CompositeSourceSetID.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/DisplaySourceSet.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/Documentable.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/JvmField.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/WithChildren.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/additionalExtras.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/ancestryNode.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/classKinds.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/defaultValues.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/doc/DocTag.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/doc/DocumentationNode.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/doc/TagWrapper.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/documentableProperties.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/documentableUtils.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/extraModifiers.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/jvmName.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/properties/PropertyContainer.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/model/properties/properties.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/pages/ContentNodes.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/pages/PageNodes.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/pages/Pages.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/pages/RendererSpecificPage.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/pages/contentNodeProperties.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/pages/utils.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/plugability/DokkaContext.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/plugability/DokkaJavaPlugin.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/plugability/DokkaPlugin.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/plugability/LazyEvaluated.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/plugability/extensions.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/renderers/PostAction.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/renderers/Renderer.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/transformers/documentation/DocumentableMerger.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/transformers/documentation/PreMergeDocumentableTransformer.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/transformers/pages/PageCreator.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/transformers/pages/PageTransformer.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/transformers/pages/PageTransformerBuilders.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/transformers/sources/AsyncSourceToDocumentableTranslator.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/transformers/sources/SourceToDocumentableTranslator.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/Collections.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/DokkaLogging.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/Html.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/SelfRepresentingSingletonSet.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/ServiceLocator.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/Uri.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/associateWithNotNull.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/cast.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/json.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/utilities/parallelCollectionOperations.kt (100%) rename {core => dokka-subprojects/core}/src/main/kotlin/validity/PreGenerationChecker.kt (100%) rename {core => dokka-subprojects/core}/src/main/resources/META-INF/MANIFEST.MF (100%) rename {core => dokka-subprojects/core}/src/main/resources/META-INF/dokka/dokka-version.properties (100%) rename {core => dokka-subprojects/core}/src/test/kotlin/model/CompositeSourceSetIDTest.kt (100%) rename {core => dokka-subprojects/core}/src/test/kotlin/model/DisplaySourceSetTest.kt (100%) rename {core => dokka-subprojects/core}/src/test/kotlin/model/DocumentableTest.kt (100%) rename {core => dokka-subprojects/core}/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt (100%) rename {core => dokka-subprojects/core}/src/test/kotlin/utilities/JsonKtTest.kt (100%) diff --git a/core/build.gradle.kts b/core/build.gradle.kts deleted file mode 100644 index 1a7a13ac68..0000000000 --- a/core/build.gradle.kts +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -import org.jetbrains.dokkaVersion -import org.jetbrains.registerDokkaArtifactPublication - -plugins { - id("org.jetbrains.conventions.kotlin-jvm") - id("org.jetbrains.conventions.maven-publish") -} - -dependencies { - implementation(kotlin("reflect")) - implementation(libs.kotlinx.coroutines.core) - implementation(libs.jackson.kotlin) - implementation(libs.jackson.xml) - constraints { - implementation(libs.jackson.databind) { - because("CVE-2022-42003") - } - } - - testImplementation(kotlin("test")) - testImplementation(projects.core.testApi) -} - -tasks { - processResources { - inputs.property("dokkaVersion", dokkaVersion) - eachFile { - if (name == "dokka-version.properties") { - filter { line -> - line.replace("", dokkaVersion) - } - } - } - } -} - -registerDokkaArtifactPublication("dokkaCore") { - artifactId = "dokka-core" -} diff --git a/core/.gitignore b/dokka-subprojects/core/.gitignore similarity index 100% rename from core/.gitignore rename to dokka-subprojects/core/.gitignore diff --git a/core/api/core.api b/dokka-subprojects/core/api/core.api similarity index 100% rename from core/api/core.api rename to dokka-subprojects/core/api/core.api diff --git a/dokka-subprojects/core/build.gradle.kts b/dokka-subprojects/core/build.gradle.kts index fa38697596..4f6651ebfe 100644 --- a/dokka-subprojects/core/build.gradle.kts +++ b/dokka-subprojects/core/build.gradle.kts @@ -1,16 +1,41 @@ -import org.jetbrains.registerDokkaArtifactPublication - /* * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. */ +import org.jetbrains.dokkaVersion +import org.jetbrains.registerDokkaArtifactPublication + plugins { id("org.jetbrains.conventions.kotlin-jvm") id("org.jetbrains.conventions.maven-publish") } dependencies { - api("org.jetbrains.dokka:dokka-core:1.9.0") + implementation(kotlin("reflect")) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.jackson.kotlin) + implementation(libs.jackson.xml) + constraints { + implementation(libs.jackson.databind) { + because("CVE-2022-42003") + } + } + + testImplementation(kotlin("test")) + testImplementation(projects.coreTestApi) +} + +tasks { + processResources { + inputs.property("dokkaVersion", dokkaVersion) + eachFile { + if (name == "dokka-version.properties") { + filter { line -> + line.replace("", dokkaVersion) + } + } + } + } } registerDokkaArtifactPublication("dokkaCore") { diff --git a/core/src/main/kotlin/ConfigurationJsonUtils.kt b/dokka-subprojects/core/src/main/kotlin/ConfigurationJsonUtils.kt similarity index 100% rename from core/src/main/kotlin/ConfigurationJsonUtils.kt rename to dokka-subprojects/core/src/main/kotlin/ConfigurationJsonUtils.kt diff --git a/core/src/main/kotlin/CoreExtensions.kt b/dokka-subprojects/core/src/main/kotlin/CoreExtensions.kt similarity index 100% rename from core/src/main/kotlin/CoreExtensions.kt rename to dokka-subprojects/core/src/main/kotlin/CoreExtensions.kt diff --git a/core/src/main/kotlin/DokkaBootstrap.kt b/dokka-subprojects/core/src/main/kotlin/DokkaBootstrap.kt similarity index 100% rename from core/src/main/kotlin/DokkaBootstrap.kt rename to dokka-subprojects/core/src/main/kotlin/DokkaBootstrap.kt diff --git a/core/src/main/kotlin/DokkaBootstrapImpl.kt b/dokka-subprojects/core/src/main/kotlin/DokkaBootstrapImpl.kt similarity index 100% rename from core/src/main/kotlin/DokkaBootstrapImpl.kt rename to dokka-subprojects/core/src/main/kotlin/DokkaBootstrapImpl.kt diff --git a/core/src/main/kotlin/DokkaException.kt b/dokka-subprojects/core/src/main/kotlin/DokkaException.kt similarity index 100% rename from core/src/main/kotlin/DokkaException.kt rename to dokka-subprojects/core/src/main/kotlin/DokkaException.kt diff --git a/core/src/main/kotlin/DokkaGenerator.kt b/dokka-subprojects/core/src/main/kotlin/DokkaGenerator.kt similarity index 100% rename from core/src/main/kotlin/DokkaGenerator.kt rename to dokka-subprojects/core/src/main/kotlin/DokkaGenerator.kt diff --git a/core/src/main/kotlin/DokkaVersion.kt b/dokka-subprojects/core/src/main/kotlin/DokkaVersion.kt similarity index 100% rename from core/src/main/kotlin/DokkaVersion.kt rename to dokka-subprojects/core/src/main/kotlin/DokkaVersion.kt diff --git a/core/src/main/kotlin/InternalDokkaApi.kt b/dokka-subprojects/core/src/main/kotlin/InternalDokkaApi.kt similarity index 100% rename from core/src/main/kotlin/InternalDokkaApi.kt rename to dokka-subprojects/core/src/main/kotlin/InternalDokkaApi.kt diff --git a/core/src/main/kotlin/configuration.kt b/dokka-subprojects/core/src/main/kotlin/configuration.kt similarity index 100% rename from core/src/main/kotlin/configuration.kt rename to dokka-subprojects/core/src/main/kotlin/configuration.kt diff --git a/core/src/main/kotlin/defaultConfiguration.kt b/dokka-subprojects/core/src/main/kotlin/defaultConfiguration.kt similarity index 100% rename from core/src/main/kotlin/defaultConfiguration.kt rename to dokka-subprojects/core/src/main/kotlin/defaultConfiguration.kt diff --git a/core/src/main/kotlin/defaultExternalLinks.kt b/dokka-subprojects/core/src/main/kotlin/defaultExternalLinks.kt similarity index 100% rename from core/src/main/kotlin/defaultExternalLinks.kt rename to dokka-subprojects/core/src/main/kotlin/defaultExternalLinks.kt diff --git a/core/src/main/kotlin/generation/Generation.kt b/dokka-subprojects/core/src/main/kotlin/generation/Generation.kt similarity index 100% rename from core/src/main/kotlin/generation/Generation.kt rename to dokka-subprojects/core/src/main/kotlin/generation/Generation.kt diff --git a/core/src/main/kotlin/links/DRI.kt b/dokka-subprojects/core/src/main/kotlin/links/DRI.kt similarity index 100% rename from core/src/main/kotlin/links/DRI.kt rename to dokka-subprojects/core/src/main/kotlin/links/DRI.kt diff --git a/core/src/main/kotlin/model/CompositeSourceSetID.kt b/dokka-subprojects/core/src/main/kotlin/model/CompositeSourceSetID.kt similarity index 100% rename from core/src/main/kotlin/model/CompositeSourceSetID.kt rename to dokka-subprojects/core/src/main/kotlin/model/CompositeSourceSetID.kt diff --git a/core/src/main/kotlin/model/DisplaySourceSet.kt b/dokka-subprojects/core/src/main/kotlin/model/DisplaySourceSet.kt similarity index 100% rename from core/src/main/kotlin/model/DisplaySourceSet.kt rename to dokka-subprojects/core/src/main/kotlin/model/DisplaySourceSet.kt diff --git a/core/src/main/kotlin/model/Documentable.kt b/dokka-subprojects/core/src/main/kotlin/model/Documentable.kt similarity index 100% rename from core/src/main/kotlin/model/Documentable.kt rename to dokka-subprojects/core/src/main/kotlin/model/Documentable.kt diff --git a/core/src/main/kotlin/model/JvmField.kt b/dokka-subprojects/core/src/main/kotlin/model/JvmField.kt similarity index 100% rename from core/src/main/kotlin/model/JvmField.kt rename to dokka-subprojects/core/src/main/kotlin/model/JvmField.kt diff --git a/core/src/main/kotlin/model/WithChildren.kt b/dokka-subprojects/core/src/main/kotlin/model/WithChildren.kt similarity index 100% rename from core/src/main/kotlin/model/WithChildren.kt rename to dokka-subprojects/core/src/main/kotlin/model/WithChildren.kt diff --git a/core/src/main/kotlin/model/additionalExtras.kt b/dokka-subprojects/core/src/main/kotlin/model/additionalExtras.kt similarity index 100% rename from core/src/main/kotlin/model/additionalExtras.kt rename to dokka-subprojects/core/src/main/kotlin/model/additionalExtras.kt diff --git a/core/src/main/kotlin/model/ancestryNode.kt b/dokka-subprojects/core/src/main/kotlin/model/ancestryNode.kt similarity index 100% rename from core/src/main/kotlin/model/ancestryNode.kt rename to dokka-subprojects/core/src/main/kotlin/model/ancestryNode.kt diff --git a/core/src/main/kotlin/model/classKinds.kt b/dokka-subprojects/core/src/main/kotlin/model/classKinds.kt similarity index 100% rename from core/src/main/kotlin/model/classKinds.kt rename to dokka-subprojects/core/src/main/kotlin/model/classKinds.kt diff --git a/core/src/main/kotlin/model/defaultValues.kt b/dokka-subprojects/core/src/main/kotlin/model/defaultValues.kt similarity index 100% rename from core/src/main/kotlin/model/defaultValues.kt rename to dokka-subprojects/core/src/main/kotlin/model/defaultValues.kt diff --git a/core/src/main/kotlin/model/doc/DocTag.kt b/dokka-subprojects/core/src/main/kotlin/model/doc/DocTag.kt similarity index 100% rename from core/src/main/kotlin/model/doc/DocTag.kt rename to dokka-subprojects/core/src/main/kotlin/model/doc/DocTag.kt diff --git a/core/src/main/kotlin/model/doc/DocumentationNode.kt b/dokka-subprojects/core/src/main/kotlin/model/doc/DocumentationNode.kt similarity index 100% rename from core/src/main/kotlin/model/doc/DocumentationNode.kt rename to dokka-subprojects/core/src/main/kotlin/model/doc/DocumentationNode.kt diff --git a/core/src/main/kotlin/model/doc/TagWrapper.kt b/dokka-subprojects/core/src/main/kotlin/model/doc/TagWrapper.kt similarity index 100% rename from core/src/main/kotlin/model/doc/TagWrapper.kt rename to dokka-subprojects/core/src/main/kotlin/model/doc/TagWrapper.kt diff --git a/core/src/main/kotlin/model/documentableProperties.kt b/dokka-subprojects/core/src/main/kotlin/model/documentableProperties.kt similarity index 100% rename from core/src/main/kotlin/model/documentableProperties.kt rename to dokka-subprojects/core/src/main/kotlin/model/documentableProperties.kt diff --git a/core/src/main/kotlin/model/documentableUtils.kt b/dokka-subprojects/core/src/main/kotlin/model/documentableUtils.kt similarity index 100% rename from core/src/main/kotlin/model/documentableUtils.kt rename to dokka-subprojects/core/src/main/kotlin/model/documentableUtils.kt diff --git a/core/src/main/kotlin/model/extraModifiers.kt b/dokka-subprojects/core/src/main/kotlin/model/extraModifiers.kt similarity index 100% rename from core/src/main/kotlin/model/extraModifiers.kt rename to dokka-subprojects/core/src/main/kotlin/model/extraModifiers.kt diff --git a/core/src/main/kotlin/model/jvmName.kt b/dokka-subprojects/core/src/main/kotlin/model/jvmName.kt similarity index 100% rename from core/src/main/kotlin/model/jvmName.kt rename to dokka-subprojects/core/src/main/kotlin/model/jvmName.kt diff --git a/core/src/main/kotlin/model/properties/PropertyContainer.kt b/dokka-subprojects/core/src/main/kotlin/model/properties/PropertyContainer.kt similarity index 100% rename from core/src/main/kotlin/model/properties/PropertyContainer.kt rename to dokka-subprojects/core/src/main/kotlin/model/properties/PropertyContainer.kt diff --git a/core/src/main/kotlin/model/properties/properties.kt b/dokka-subprojects/core/src/main/kotlin/model/properties/properties.kt similarity index 100% rename from core/src/main/kotlin/model/properties/properties.kt rename to dokka-subprojects/core/src/main/kotlin/model/properties/properties.kt diff --git a/core/src/main/kotlin/pages/ContentNodes.kt b/dokka-subprojects/core/src/main/kotlin/pages/ContentNodes.kt similarity index 100% rename from core/src/main/kotlin/pages/ContentNodes.kt rename to dokka-subprojects/core/src/main/kotlin/pages/ContentNodes.kt diff --git a/core/src/main/kotlin/pages/PageNodes.kt b/dokka-subprojects/core/src/main/kotlin/pages/PageNodes.kt similarity index 100% rename from core/src/main/kotlin/pages/PageNodes.kt rename to dokka-subprojects/core/src/main/kotlin/pages/PageNodes.kt diff --git a/core/src/main/kotlin/pages/Pages.kt b/dokka-subprojects/core/src/main/kotlin/pages/Pages.kt similarity index 100% rename from core/src/main/kotlin/pages/Pages.kt rename to dokka-subprojects/core/src/main/kotlin/pages/Pages.kt diff --git a/core/src/main/kotlin/pages/RendererSpecificPage.kt b/dokka-subprojects/core/src/main/kotlin/pages/RendererSpecificPage.kt similarity index 100% rename from core/src/main/kotlin/pages/RendererSpecificPage.kt rename to dokka-subprojects/core/src/main/kotlin/pages/RendererSpecificPage.kt diff --git a/core/src/main/kotlin/pages/contentNodeProperties.kt b/dokka-subprojects/core/src/main/kotlin/pages/contentNodeProperties.kt similarity index 100% rename from core/src/main/kotlin/pages/contentNodeProperties.kt rename to dokka-subprojects/core/src/main/kotlin/pages/contentNodeProperties.kt diff --git a/core/src/main/kotlin/pages/utils.kt b/dokka-subprojects/core/src/main/kotlin/pages/utils.kt similarity index 100% rename from core/src/main/kotlin/pages/utils.kt rename to dokka-subprojects/core/src/main/kotlin/pages/utils.kt diff --git a/core/src/main/kotlin/plugability/DokkaContext.kt b/dokka-subprojects/core/src/main/kotlin/plugability/DokkaContext.kt similarity index 100% rename from core/src/main/kotlin/plugability/DokkaContext.kt rename to dokka-subprojects/core/src/main/kotlin/plugability/DokkaContext.kt diff --git a/core/src/main/kotlin/plugability/DokkaJavaPlugin.kt b/dokka-subprojects/core/src/main/kotlin/plugability/DokkaJavaPlugin.kt similarity index 100% rename from core/src/main/kotlin/plugability/DokkaJavaPlugin.kt rename to dokka-subprojects/core/src/main/kotlin/plugability/DokkaJavaPlugin.kt diff --git a/core/src/main/kotlin/plugability/DokkaPlugin.kt b/dokka-subprojects/core/src/main/kotlin/plugability/DokkaPlugin.kt similarity index 100% rename from core/src/main/kotlin/plugability/DokkaPlugin.kt rename to dokka-subprojects/core/src/main/kotlin/plugability/DokkaPlugin.kt diff --git a/core/src/main/kotlin/plugability/LazyEvaluated.kt b/dokka-subprojects/core/src/main/kotlin/plugability/LazyEvaluated.kt similarity index 100% rename from core/src/main/kotlin/plugability/LazyEvaluated.kt rename to dokka-subprojects/core/src/main/kotlin/plugability/LazyEvaluated.kt diff --git a/core/src/main/kotlin/plugability/extensions.kt b/dokka-subprojects/core/src/main/kotlin/plugability/extensions.kt similarity index 100% rename from core/src/main/kotlin/plugability/extensions.kt rename to dokka-subprojects/core/src/main/kotlin/plugability/extensions.kt diff --git a/core/src/main/kotlin/renderers/PostAction.kt b/dokka-subprojects/core/src/main/kotlin/renderers/PostAction.kt similarity index 100% rename from core/src/main/kotlin/renderers/PostAction.kt rename to dokka-subprojects/core/src/main/kotlin/renderers/PostAction.kt diff --git a/core/src/main/kotlin/renderers/Renderer.kt b/dokka-subprojects/core/src/main/kotlin/renderers/Renderer.kt similarity index 100% rename from core/src/main/kotlin/renderers/Renderer.kt rename to dokka-subprojects/core/src/main/kotlin/renderers/Renderer.kt diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt b/dokka-subprojects/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt similarity index 100% rename from core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt rename to dokka-subprojects/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt b/dokka-subprojects/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt similarity index 100% rename from core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt rename to dokka-subprojects/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt b/dokka-subprojects/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt similarity index 100% rename from core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt rename to dokka-subprojects/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt diff --git a/core/src/main/kotlin/transformers/documentation/PreMergeDocumentableTransformer.kt b/dokka-subprojects/core/src/main/kotlin/transformers/documentation/PreMergeDocumentableTransformer.kt similarity index 100% rename from core/src/main/kotlin/transformers/documentation/PreMergeDocumentableTransformer.kt rename to dokka-subprojects/core/src/main/kotlin/transformers/documentation/PreMergeDocumentableTransformer.kt diff --git a/core/src/main/kotlin/transformers/pages/PageCreator.kt b/dokka-subprojects/core/src/main/kotlin/transformers/pages/PageCreator.kt similarity index 100% rename from core/src/main/kotlin/transformers/pages/PageCreator.kt rename to dokka-subprojects/core/src/main/kotlin/transformers/pages/PageCreator.kt diff --git a/core/src/main/kotlin/transformers/pages/PageTransformer.kt b/dokka-subprojects/core/src/main/kotlin/transformers/pages/PageTransformer.kt similarity index 100% rename from core/src/main/kotlin/transformers/pages/PageTransformer.kt rename to dokka-subprojects/core/src/main/kotlin/transformers/pages/PageTransformer.kt diff --git a/core/src/main/kotlin/transformers/pages/PageTransformerBuilders.kt b/dokka-subprojects/core/src/main/kotlin/transformers/pages/PageTransformerBuilders.kt similarity index 100% rename from core/src/main/kotlin/transformers/pages/PageTransformerBuilders.kt rename to dokka-subprojects/core/src/main/kotlin/transformers/pages/PageTransformerBuilders.kt diff --git a/core/src/main/kotlin/transformers/sources/AsyncSourceToDocumentableTranslator.kt b/dokka-subprojects/core/src/main/kotlin/transformers/sources/AsyncSourceToDocumentableTranslator.kt similarity index 100% rename from core/src/main/kotlin/transformers/sources/AsyncSourceToDocumentableTranslator.kt rename to dokka-subprojects/core/src/main/kotlin/transformers/sources/AsyncSourceToDocumentableTranslator.kt diff --git a/core/src/main/kotlin/transformers/sources/SourceToDocumentableTranslator.kt b/dokka-subprojects/core/src/main/kotlin/transformers/sources/SourceToDocumentableTranslator.kt similarity index 100% rename from core/src/main/kotlin/transformers/sources/SourceToDocumentableTranslator.kt rename to dokka-subprojects/core/src/main/kotlin/transformers/sources/SourceToDocumentableTranslator.kt diff --git a/core/src/main/kotlin/utilities/Collections.kt b/dokka-subprojects/core/src/main/kotlin/utilities/Collections.kt similarity index 100% rename from core/src/main/kotlin/utilities/Collections.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/Collections.kt diff --git a/core/src/main/kotlin/utilities/DokkaLogging.kt b/dokka-subprojects/core/src/main/kotlin/utilities/DokkaLogging.kt similarity index 100% rename from core/src/main/kotlin/utilities/DokkaLogging.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/DokkaLogging.kt diff --git a/core/src/main/kotlin/utilities/Html.kt b/dokka-subprojects/core/src/main/kotlin/utilities/Html.kt similarity index 100% rename from core/src/main/kotlin/utilities/Html.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/Html.kt diff --git a/core/src/main/kotlin/utilities/SelfRepresentingSingletonSet.kt b/dokka-subprojects/core/src/main/kotlin/utilities/SelfRepresentingSingletonSet.kt similarity index 100% rename from core/src/main/kotlin/utilities/SelfRepresentingSingletonSet.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/SelfRepresentingSingletonSet.kt diff --git a/core/src/main/kotlin/utilities/ServiceLocator.kt b/dokka-subprojects/core/src/main/kotlin/utilities/ServiceLocator.kt similarity index 100% rename from core/src/main/kotlin/utilities/ServiceLocator.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/ServiceLocator.kt diff --git a/core/src/main/kotlin/utilities/Uri.kt b/dokka-subprojects/core/src/main/kotlin/utilities/Uri.kt similarity index 100% rename from core/src/main/kotlin/utilities/Uri.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/Uri.kt diff --git a/core/src/main/kotlin/utilities/associateWithNotNull.kt b/dokka-subprojects/core/src/main/kotlin/utilities/associateWithNotNull.kt similarity index 100% rename from core/src/main/kotlin/utilities/associateWithNotNull.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/associateWithNotNull.kt diff --git a/core/src/main/kotlin/utilities/cast.kt b/dokka-subprojects/core/src/main/kotlin/utilities/cast.kt similarity index 100% rename from core/src/main/kotlin/utilities/cast.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/cast.kt diff --git a/core/src/main/kotlin/utilities/json.kt b/dokka-subprojects/core/src/main/kotlin/utilities/json.kt similarity index 100% rename from core/src/main/kotlin/utilities/json.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/json.kt diff --git a/core/src/main/kotlin/utilities/parallelCollectionOperations.kt b/dokka-subprojects/core/src/main/kotlin/utilities/parallelCollectionOperations.kt similarity index 100% rename from core/src/main/kotlin/utilities/parallelCollectionOperations.kt rename to dokka-subprojects/core/src/main/kotlin/utilities/parallelCollectionOperations.kt diff --git a/core/src/main/kotlin/validity/PreGenerationChecker.kt b/dokka-subprojects/core/src/main/kotlin/validity/PreGenerationChecker.kt similarity index 100% rename from core/src/main/kotlin/validity/PreGenerationChecker.kt rename to dokka-subprojects/core/src/main/kotlin/validity/PreGenerationChecker.kt diff --git a/core/src/main/resources/META-INF/MANIFEST.MF b/dokka-subprojects/core/src/main/resources/META-INF/MANIFEST.MF similarity index 100% rename from core/src/main/resources/META-INF/MANIFEST.MF rename to dokka-subprojects/core/src/main/resources/META-INF/MANIFEST.MF diff --git a/core/src/main/resources/META-INF/dokka/dokka-version.properties b/dokka-subprojects/core/src/main/resources/META-INF/dokka/dokka-version.properties similarity index 100% rename from core/src/main/resources/META-INF/dokka/dokka-version.properties rename to dokka-subprojects/core/src/main/resources/META-INF/dokka/dokka-version.properties diff --git a/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt b/dokka-subprojects/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt similarity index 100% rename from core/src/test/kotlin/model/CompositeSourceSetIDTest.kt rename to dokka-subprojects/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt diff --git a/core/src/test/kotlin/model/DisplaySourceSetTest.kt b/dokka-subprojects/core/src/test/kotlin/model/DisplaySourceSetTest.kt similarity index 100% rename from core/src/test/kotlin/model/DisplaySourceSetTest.kt rename to dokka-subprojects/core/src/test/kotlin/model/DisplaySourceSetTest.kt diff --git a/core/src/test/kotlin/model/DocumentableTest.kt b/dokka-subprojects/core/src/test/kotlin/model/DocumentableTest.kt similarity index 100% rename from core/src/test/kotlin/model/DocumentableTest.kt rename to dokka-subprojects/core/src/test/kotlin/model/DocumentableTest.kt diff --git a/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt b/dokka-subprojects/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt similarity index 100% rename from core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt rename to dokka-subprojects/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt diff --git a/core/src/test/kotlin/utilities/JsonKtTest.kt b/dokka-subprojects/core/src/test/kotlin/utilities/JsonKtTest.kt similarity index 100% rename from core/src/test/kotlin/utilities/JsonKtTest.kt rename to dokka-subprojects/core/src/test/kotlin/utilities/JsonKtTest.kt