Move dokka-core (#3173)

Kotlin · Sep 5, 2023 · ec41cc1 · ec41cc1
1 parent 7ac239e
commit ec41cc1
Show file tree

Hide file tree

Showing 75 changed files with 28 additions and 46 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
diff --git a/core/.gitignore → dokka-subprojects/core/.gitignore b/core/.gitignore → dokka-subprojects/core/.gitignore
diff --git a/core/api/core.api → dokka-subprojects/core/api/core.api b/core/api/core.api → dokka-subprojects/core/api/core.api
diff --git 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("<dokka-version>", dokkaVersion)
+                }
+            }
+        }
+    }
 }
 
 registerDokkaArtifactPublication("dokkaCore") {

diff --git a/...src/main/kotlin/ConfigurationJsonUtils.kt → ...src/main/kotlin/ConfigurationJsonUtils.kt b/...src/main/kotlin/ConfigurationJsonUtils.kt → ...src/main/kotlin/ConfigurationJsonUtils.kt
diff --git a/core/src/main/kotlin/CoreExtensions.kt → ...ts/core/src/main/kotlin/CoreExtensions.kt b/core/src/main/kotlin/CoreExtensions.kt → ...ts/core/src/main/kotlin/CoreExtensions.kt
diff --git a/core/src/main/kotlin/DokkaBootstrap.kt → ...ts/core/src/main/kotlin/DokkaBootstrap.kt b/core/src/main/kotlin/DokkaBootstrap.kt → ...ts/core/src/main/kotlin/DokkaBootstrap.kt
diff --git a/core/src/main/kotlin/DokkaBootstrapImpl.kt → ...ore/src/main/kotlin/DokkaBootstrapImpl.kt b/core/src/main/kotlin/DokkaBootstrapImpl.kt → ...ore/src/main/kotlin/DokkaBootstrapImpl.kt
diff --git a/core/src/main/kotlin/DokkaException.kt → ...ts/core/src/main/kotlin/DokkaException.kt b/core/src/main/kotlin/DokkaException.kt → ...ts/core/src/main/kotlin/DokkaException.kt
diff --git a/core/src/main/kotlin/DokkaGenerator.kt → ...ts/core/src/main/kotlin/DokkaGenerator.kt b/core/src/main/kotlin/DokkaGenerator.kt → ...ts/core/src/main/kotlin/DokkaGenerator.kt
diff --git a/core/src/main/kotlin/DokkaVersion.kt → ...ects/core/src/main/kotlin/DokkaVersion.kt b/core/src/main/kotlin/DokkaVersion.kt → ...ects/core/src/main/kotlin/DokkaVersion.kt
diff --git a/core/src/main/kotlin/InternalDokkaApi.kt → .../core/src/main/kotlin/InternalDokkaApi.kt b/core/src/main/kotlin/InternalDokkaApi.kt → .../core/src/main/kotlin/InternalDokkaApi.kt
diff --git a/core/src/main/kotlin/configuration.kt → ...cts/core/src/main/kotlin/configuration.kt b/core/src/main/kotlin/configuration.kt → ...cts/core/src/main/kotlin/configuration.kt
diff --git a/core/src/main/kotlin/defaultConfiguration.kt → ...e/src/main/kotlin/defaultConfiguration.kt b/core/src/main/kotlin/defaultConfiguration.kt → ...e/src/main/kotlin/defaultConfiguration.kt
diff --git a/core/src/main/kotlin/defaultExternalLinks.kt → ...e/src/main/kotlin/defaultExternalLinks.kt b/core/src/main/kotlin/defaultExternalLinks.kt → ...e/src/main/kotlin/defaultExternalLinks.kt
diff --git a/.../src/main/kotlin/generation/Generation.kt → .../src/main/kotlin/generation/Generation.kt b/.../src/main/kotlin/generation/Generation.kt → .../src/main/kotlin/generation/Generation.kt
diff --git a/core/src/main/kotlin/links/DRI.kt → ...rojects/core/src/main/kotlin/links/DRI.kt b/core/src/main/kotlin/links/DRI.kt → ...rojects/core/src/main/kotlin/links/DRI.kt
diff --git a/...main/kotlin/model/CompositeSourceSetID.kt → ...main/kotlin/model/CompositeSourceSetID.kt b/...main/kotlin/model/CompositeSourceSetID.kt → ...main/kotlin/model/CompositeSourceSetID.kt
diff --git a/...src/main/kotlin/model/DisplaySourceSet.kt → ...src/main/kotlin/model/DisplaySourceSet.kt b/...src/main/kotlin/model/DisplaySourceSet.kt → ...src/main/kotlin/model/DisplaySourceSet.kt
diff --git a/core/src/main/kotlin/model/Documentable.kt → ...ore/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt → ...ore/src/main/kotlin/model/Documentable.kt
diff --git a/core/src/main/kotlin/model/JvmField.kt → ...ts/core/src/main/kotlin/model/JvmField.kt b/core/src/main/kotlin/model/JvmField.kt → ...ts/core/src/main/kotlin/model/JvmField.kt
diff --git a/core/src/main/kotlin/model/WithChildren.kt → ...ore/src/main/kotlin/model/WithChildren.kt b/core/src/main/kotlin/model/WithChildren.kt → ...ore/src/main/kotlin/model/WithChildren.kt
diff --git a/...src/main/kotlin/model/additionalExtras.kt → ...src/main/kotlin/model/additionalExtras.kt b/...src/main/kotlin/model/additionalExtras.kt → ...src/main/kotlin/model/additionalExtras.kt
diff --git a/core/src/main/kotlin/model/ancestryNode.kt → ...ore/src/main/kotlin/model/ancestryNode.kt b/core/src/main/kotlin/model/ancestryNode.kt → ...ore/src/main/kotlin/model/ancestryNode.kt
diff --git a/core/src/main/kotlin/model/classKinds.kt → .../core/src/main/kotlin/model/classKinds.kt b/core/src/main/kotlin/model/classKinds.kt → .../core/src/main/kotlin/model/classKinds.kt
diff --git a/core/src/main/kotlin/model/defaultValues.kt → ...re/src/main/kotlin/model/defaultValues.kt b/core/src/main/kotlin/model/defaultValues.kt → ...re/src/main/kotlin/model/defaultValues.kt
diff --git a/core/src/main/kotlin/model/doc/DocTag.kt → .../core/src/main/kotlin/model/doc/DocTag.kt b/core/src/main/kotlin/model/doc/DocTag.kt → .../core/src/main/kotlin/model/doc/DocTag.kt
diff --git a/...ain/kotlin/model/doc/DocumentationNode.kt → ...ain/kotlin/model/doc/DocumentationNode.kt b/...ain/kotlin/model/doc/DocumentationNode.kt → ...ain/kotlin/model/doc/DocumentationNode.kt
diff --git a/core/src/main/kotlin/model/doc/TagWrapper.kt → ...e/src/main/kotlin/model/doc/TagWrapper.kt b/core/src/main/kotlin/model/doc/TagWrapper.kt → ...e/src/main/kotlin/model/doc/TagWrapper.kt
diff --git a/...in/kotlin/model/documentableProperties.kt → ...in/kotlin/model/documentableProperties.kt b/...in/kotlin/model/documentableProperties.kt → ...in/kotlin/model/documentableProperties.kt
diff --git a/...rc/main/kotlin/model/documentableUtils.kt → ...rc/main/kotlin/model/documentableUtils.kt b/...rc/main/kotlin/model/documentableUtils.kt → ...rc/main/kotlin/model/documentableUtils.kt
diff --git a/core/src/main/kotlin/model/extraModifiers.kt → ...e/src/main/kotlin/model/extraModifiers.kt b/core/src/main/kotlin/model/extraModifiers.kt → ...e/src/main/kotlin/model/extraModifiers.kt
diff --git a/core/src/main/kotlin/model/jvmName.kt → ...cts/core/src/main/kotlin/model/jvmName.kt b/core/src/main/kotlin/model/jvmName.kt → ...cts/core/src/main/kotlin/model/jvmName.kt
diff --git a/...lin/model/properties/PropertyContainer.kt → ...lin/model/properties/PropertyContainer.kt b/...lin/model/properties/PropertyContainer.kt → ...lin/model/properties/PropertyContainer.kt
diff --git a/...ain/kotlin/model/properties/properties.kt → ...ain/kotlin/model/properties/properties.kt b/...ain/kotlin/model/properties/properties.kt → ...ain/kotlin/model/properties/properties.kt
diff --git a/core/src/main/kotlin/pages/ContentNodes.kt → ...ore/src/main/kotlin/pages/ContentNodes.kt b/core/src/main/kotlin/pages/ContentNodes.kt → ...ore/src/main/kotlin/pages/ContentNodes.kt
diff --git a/core/src/main/kotlin/pages/PageNodes.kt → ...s/core/src/main/kotlin/pages/PageNodes.kt b/core/src/main/kotlin/pages/PageNodes.kt → ...s/core/src/main/kotlin/pages/PageNodes.kt
diff --git a/core/src/main/kotlin/pages/Pages.kt → ...jects/core/src/main/kotlin/pages/Pages.kt b/core/src/main/kotlin/pages/Pages.kt → ...jects/core/src/main/kotlin/pages/Pages.kt
diff --git a/...main/kotlin/pages/RendererSpecificPage.kt → ...main/kotlin/pages/RendererSpecificPage.kt b/...main/kotlin/pages/RendererSpecificPage.kt → ...main/kotlin/pages/RendererSpecificPage.kt
diff --git a/...ain/kotlin/pages/contentNodeProperties.kt → ...ain/kotlin/pages/contentNodeProperties.kt b/...ain/kotlin/pages/contentNodeProperties.kt → ...ain/kotlin/pages/contentNodeProperties.kt
diff --git a/core/src/main/kotlin/pages/utils.kt → ...jects/core/src/main/kotlin/pages/utils.kt b/core/src/main/kotlin/pages/utils.kt → ...jects/core/src/main/kotlin/pages/utils.kt
diff --git a/...c/main/kotlin/plugability/DokkaContext.kt → ...c/main/kotlin/plugability/DokkaContext.kt b/...c/main/kotlin/plugability/DokkaContext.kt → ...c/main/kotlin/plugability/DokkaContext.kt
diff --git a/...ain/kotlin/plugability/DokkaJavaPlugin.kt → ...ain/kotlin/plugability/DokkaJavaPlugin.kt b/...ain/kotlin/plugability/DokkaJavaPlugin.kt → ...ain/kotlin/plugability/DokkaJavaPlugin.kt
diff --git a/...rc/main/kotlin/plugability/DokkaPlugin.kt → ...rc/main/kotlin/plugability/DokkaPlugin.kt b/...rc/main/kotlin/plugability/DokkaPlugin.kt → ...rc/main/kotlin/plugability/DokkaPlugin.kt
diff --git a/.../main/kotlin/plugability/LazyEvaluated.kt → .../main/kotlin/plugability/LazyEvaluated.kt b/.../main/kotlin/plugability/LazyEvaluated.kt → .../main/kotlin/plugability/LazyEvaluated.kt
diff --git a/...src/main/kotlin/plugability/extensions.kt → ...src/main/kotlin/plugability/extensions.kt b/...src/main/kotlin/plugability/extensions.kt → ...src/main/kotlin/plugability/extensions.kt
diff --git a/core/src/main/kotlin/renderers/PostAction.kt → ...e/src/main/kotlin/renderers/PostAction.kt b/core/src/main/kotlin/renderers/PostAction.kt → ...e/src/main/kotlin/renderers/PostAction.kt
diff --git a/core/src/main/kotlin/renderers/Renderer.kt → ...ore/src/main/kotlin/renderers/Renderer.kt b/core/src/main/kotlin/renderers/Renderer.kt → ...ore/src/main/kotlin/renderers/Renderer.kt
diff --git a/...rmers/documentation/DocumentableMerger.kt → ...rmers/documentation/DocumentableMerger.kt b/...rmers/documentation/DocumentableMerger.kt → ...rmers/documentation/DocumentableMerger.kt
diff --git a/...mentation/DocumentableToPageTranslator.kt → ...mentation/DocumentableToPageTranslator.kt b/...mentation/DocumentableToPageTranslator.kt → ...mentation/DocumentableToPageTranslator.kt
diff --git a/.../documentation/DocumentableTransformer.kt → .../documentation/DocumentableTransformer.kt b/.../documentation/DocumentableTransformer.kt → .../documentation/DocumentableTransformer.kt
diff --git a/...tation/PreMergeDocumentableTransformer.kt → ...tation/PreMergeDocumentableTransformer.kt b/...tation/PreMergeDocumentableTransformer.kt → ...tation/PreMergeDocumentableTransformer.kt
diff --git a/.../kotlin/transformers/pages/PageCreator.kt → .../kotlin/transformers/pages/PageCreator.kt b/.../kotlin/transformers/pages/PageCreator.kt → .../kotlin/transformers/pages/PageCreator.kt
diff --git a/...lin/transformers/pages/PageTransformer.kt → ...lin/transformers/pages/PageTransformer.kt b/...lin/transformers/pages/PageTransformer.kt → ...lin/transformers/pages/PageTransformer.kt
diff --git a/...sformers/pages/PageTransformerBuilders.kt → ...sformers/pages/PageTransformerBuilders.kt b/...sformers/pages/PageTransformerBuilders.kt → ...sformers/pages/PageTransformerBuilders.kt
diff --git a/...es/AsyncSourceToDocumentableTranslator.kt → ...es/AsyncSourceToDocumentableTranslator.kt b/...es/AsyncSourceToDocumentableTranslator.kt → ...es/AsyncSourceToDocumentableTranslator.kt
diff --git a/...sources/SourceToDocumentableTranslator.kt → ...sources/SourceToDocumentableTranslator.kt b/...sources/SourceToDocumentableTranslator.kt → ...sources/SourceToDocumentableTranslator.kt
diff --git a/.../src/main/kotlin/utilities/Collections.kt → .../src/main/kotlin/utilities/Collections.kt b/.../src/main/kotlin/utilities/Collections.kt → .../src/main/kotlin/utilities/Collections.kt
diff --git a/...src/main/kotlin/utilities/DokkaLogging.kt → ...src/main/kotlin/utilities/DokkaLogging.kt b/...src/main/kotlin/utilities/DokkaLogging.kt → ...src/main/kotlin/utilities/DokkaLogging.kt
diff --git a/core/src/main/kotlin/utilities/Html.kt → ...ts/core/src/main/kotlin/utilities/Html.kt b/core/src/main/kotlin/utilities/Html.kt → ...ts/core/src/main/kotlin/utilities/Html.kt
diff --git a/...utilities/SelfRepresentingSingletonSet.kt → ...utilities/SelfRepresentingSingletonSet.kt b/...utilities/SelfRepresentingSingletonSet.kt → ...utilities/SelfRepresentingSingletonSet.kt
diff --git a/...c/main/kotlin/utilities/ServiceLocator.kt → ...c/main/kotlin/utilities/ServiceLocator.kt b/...c/main/kotlin/utilities/ServiceLocator.kt → ...c/main/kotlin/utilities/ServiceLocator.kt
diff --git a/core/src/main/kotlin/utilities/Uri.kt → ...cts/core/src/main/kotlin/utilities/Uri.kt b/core/src/main/kotlin/utilities/Uri.kt → ...cts/core/src/main/kotlin/utilities/Uri.kt
diff --git a/.../kotlin/utilities/associateWithNotNull.kt → .../kotlin/utilities/associateWithNotNull.kt b/.../kotlin/utilities/associateWithNotNull.kt → .../kotlin/utilities/associateWithNotNull.kt
diff --git a/core/src/main/kotlin/utilities/cast.kt → ...ts/core/src/main/kotlin/utilities/cast.kt b/core/src/main/kotlin/utilities/cast.kt → ...ts/core/src/main/kotlin/utilities/cast.kt
diff --git a/core/src/main/kotlin/utilities/json.kt → ...ts/core/src/main/kotlin/utilities/json.kt b/core/src/main/kotlin/utilities/json.kt → ...ts/core/src/main/kotlin/utilities/json.kt
diff --git a/...utilities/parallelCollectionOperations.kt → ...utilities/parallelCollectionOperations.kt b/...utilities/parallelCollectionOperations.kt → ...utilities/parallelCollectionOperations.kt
diff --git a/...n/kotlin/validity/PreGenerationChecker.kt → ...n/kotlin/validity/PreGenerationChecker.kt b/...n/kotlin/validity/PreGenerationChecker.kt → ...n/kotlin/validity/PreGenerationChecker.kt
diff --git a/core/src/main/resources/META-INF/MANIFEST.MF → ...e/src/main/resources/META-INF/MANIFEST.MF b/core/src/main/resources/META-INF/MANIFEST.MF → ...e/src/main/resources/META-INF/MANIFEST.MF
diff --git a/...s/META-INF/dokka/dokka-version.properties → ...s/META-INF/dokka/dokka-version.properties b/...s/META-INF/dokka/dokka-version.properties → ...s/META-INF/dokka/dokka-version.properties
diff --git a/.../kotlin/model/CompositeSourceSetIDTest.kt → .../kotlin/model/CompositeSourceSetIDTest.kt b/.../kotlin/model/CompositeSourceSetIDTest.kt → .../kotlin/model/CompositeSourceSetIDTest.kt
diff --git a/...test/kotlin/model/DisplaySourceSetTest.kt → ...test/kotlin/model/DisplaySourceSetTest.kt b/...test/kotlin/model/DisplaySourceSetTest.kt → ...test/kotlin/model/DisplaySourceSetTest.kt
diff --git a/...src/test/kotlin/model/DocumentableTest.kt → ...src/test/kotlin/model/DocumentableTest.kt b/...src/test/kotlin/model/DocumentableTest.kt → ...src/test/kotlin/model/DocumentableTest.kt
diff --git a/...n/utilities/DokkaConfigurationJsonTest.kt → ...n/utilities/DokkaConfigurationJsonTest.kt b/...n/utilities/DokkaConfigurationJsonTest.kt → ...n/utilities/DokkaConfigurationJsonTest.kt
diff --git a/core/src/test/kotlin/utilities/JsonKtTest.kt → ...e/src/test/kotlin/utilities/JsonKtTest.kt b/core/src/test/kotlin/utilities/JsonKtTest.kt → ...e/src/test/kotlin/utilities/JsonKtTest.kt