From 8e5c63d035ef44a269b8c43430f43f5c8eebfb63 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Fri, 10 Nov 2023 11:46:54 +0100 Subject: Restructure the project to utilize included builds (#3174) * Refactor and simplify artifact publishing * Update Gradle to 8.4 * Refactor and simplify convention plugins and build scripts Fixes #3132 --------- Co-authored-by: Adam <897017+aSemy@users.noreply.github.com> Co-authored-by: Oleg Yukhnevich --- core/src/main/kotlin/model/doc/DocTag.kt | 372 --------------------- .../src/main/kotlin/model/doc/DocumentationNode.kt | 9 - core/src/main/kotlin/model/doc/TagWrapper.kt | 36 -- 3 files changed, 417 deletions(-) delete mode 100644 core/src/main/kotlin/model/doc/DocTag.kt delete mode 100644 core/src/main/kotlin/model/doc/DocumentationNode.kt delete mode 100644 core/src/main/kotlin/model/doc/TagWrapper.kt (limited to 'core/src/main/kotlin/model/doc') diff --git a/core/src/main/kotlin/model/doc/DocTag.kt b/core/src/main/kotlin/model/doc/DocTag.kt deleted file mode 100644 index f4cb9b33..00000000 --- a/core/src/main/kotlin/model/doc/DocTag.kt +++ /dev/null @@ -1,372 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package org.jetbrains.dokka.model.doc - -import org.jetbrains.dokka.links.DRI -import org.jetbrains.dokka.model.WithChildren - -public sealed class DocTag : WithChildren { - public abstract val params: Map - - public companion object { - public fun contentTypeParam(type: String): Map = mapOf("content-type" to type) - } -} - -public data class A( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Big( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class B( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class BlockQuote( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public object Br : DocTag() { - override val children: List = emptyList() - override val params: Map = emptyMap() -} - -public data class Cite( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public sealed class Code : DocTag() - -public data class CodeInline( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : Code() - -public data class CodeBlock( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : Code() - -public data class CustomDocTag( - override val children: List = emptyList(), - override val params: Map = emptyMap(), - val name: String -) : DocTag() - -public data class Dd( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Dfn( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Dir( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Div( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Dl( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class DocumentationLink( - val dri: DRI, - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Dt( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Em( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Font( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Footer( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Frame( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class FrameSet( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class H1( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class H2( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class H3( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class H4( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class H5( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class H6( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Head( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Header( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public object HorizontalRule : DocTag() { - override val children: List = emptyList() - override val params: Map = emptyMap() -} - -public data class Html( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class I( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class IFrame( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Img( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Index( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Input( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Li( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Link( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Listing( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Main( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Menu( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Meta( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Nav( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class NoFrames( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class NoScript( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Ol( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class P( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Pre( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Script( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Section( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Small( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Span( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Strikethrough( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Strong( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Sub( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Sup( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Table( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Text( - val body: String = "", - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class TBody( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Td( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class TFoot( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Th( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class THead( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Title( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Tr( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Tt( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class U( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Ul( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Var( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - -public data class Caption( - override val children: List = emptyList(), - override val params: Map = emptyMap() -) : DocTag() - diff --git a/core/src/main/kotlin/model/doc/DocumentationNode.kt b/core/src/main/kotlin/model/doc/DocumentationNode.kt deleted file mode 100644 index 9c270f79..00000000 --- a/core/src/main/kotlin/model/doc/DocumentationNode.kt +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package org.jetbrains.dokka.model.doc - -import org.jetbrains.dokka.model.WithChildren - -public data class DocumentationNode(override val children: List): WithChildren diff --git a/core/src/main/kotlin/model/doc/TagWrapper.kt b/core/src/main/kotlin/model/doc/TagWrapper.kt deleted file mode 100644 index e3eaffb7..00000000 --- a/core/src/main/kotlin/model/doc/TagWrapper.kt +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package org.jetbrains.dokka.model.doc - -import org.jetbrains.dokka.links.DRI -import org.jetbrains.dokka.model.WithChildren - -public sealed class TagWrapper : WithChildren { - public abstract val root: DocTag - - override val children: List - get() = root.children -} - -public sealed class NamedTagWrapper : TagWrapper() { - public abstract val name: String -} - -public data class Description(override val root: DocTag) : TagWrapper() -public data class Author(override val root: DocTag) : TagWrapper() -public data class Version(override val root: DocTag) : TagWrapper() -public data class Since(override val root: DocTag) : TagWrapper() -public data class See(override val root: DocTag, override val name: String, val address: DRI?) : NamedTagWrapper() -public data class Param(override val root: DocTag, override val name: String) : NamedTagWrapper() -public data class Return(override val root: DocTag) : TagWrapper() -public data class Receiver(override val root: DocTag) : TagWrapper() -public data class Constructor(override val root: DocTag) : TagWrapper() -//TODO this naming is confusing since kotlin has Throws annotation -public data class Throws(override val root: DocTag, override val name: String, val exceptionAddress: DRI?) : NamedTagWrapper() -public data class Sample(override val root: DocTag, override val name: String) : NamedTagWrapper() -public data class Deprecated(override val root: DocTag) : TagWrapper() -public data class Property(override val root: DocTag, override val name: String) : NamedTagWrapper() -public data class Suppress(override val root: DocTag) : TagWrapper() -public data class CustomTagWrapper(override val root: DocTag, override val name: String) : NamedTagWrapper() -- cgit