From c09bde34ff729ef9b1f3bea602fb53cd4e6dca42 Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Fri, 13 Mar 2020 10:46:33 +0100
Subject: Gradle Task supporting multimodular projects

---
 plugins/jekyll/build.gradle.kts | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/jekyll/build.gradle.kts

(limited to 'plugins/jekyll/build.gradle.kts')

diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
new file mode 100644
index 00000000..535a0aef
--- /dev/null
+++ b/plugins/jekyll/build.gradle.kts
@@ -0,0 +1,8 @@
+publishing {
+    publications {
+        register<MavenPublication>("jekyll-plugin") {
+            artifactId = "jekyll-plugin"
+            from(components["java"])
+        }
+    }
+}
\ No newline at end of file
-- 
cgit 


From 10e8dc85946aabf797d73552e0bc98330764ba3f Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Tue, 31 Mar 2020 13:33:31 +0200
Subject: Fixes problems with Markdown and Jekyll

---
 .../resolvers/local/DefaultLocationProvider.kt     |   2 +-
 plugins/gfm/build.gradle.kts                       |   8 +-
 plugins/gfm/src/main/kotlin/GfmPlugin.kt           |  42 ++++--
 plugins/jekyll/build.gradle.kts                    |   7 +-
 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt     | 158 +--------------------
 settings.gradle.kts                                |   2 +
 6 files changed, 46 insertions(+), 173 deletions(-)

(limited to 'plugins/jekyll/build.gradle.kts')

diff --git a/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt
index 736367a9..29c4a425 100644
--- a/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt
+++ b/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt
@@ -21,7 +21,7 @@ open class DefaultLocationProvider(
     protected val pageGraphRoot: RootPageNode,
     protected val dokkaContext: DokkaContext
 ) : LocationProvider {
-    protected val extension = ".html"
+    protected open val extension = ".html"
 
     protected val externalLocationProviderFactories =
         dokkaContext.plugin<DokkaBase>().query { externalLocationProviderFactory }
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index c327b96c..c0226345 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -1,8 +1,12 @@
 publishing {
     publications {
-        register<MavenPublication>("gfm-plugin") {
+        register<MavenPublication>("gfmPlugin") {
             artifactId = "gfm-plugin"
             from(components["java"])
         }
     }
-}
\ No newline at end of file
+}
+
+dependencies {
+    implementation(project(":plugins:base"))
+}
diff --git a/plugins/gfm/src/main/kotlin/GfmPlugin.kt b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
index 64a2cdfc..7c0ce509 100644
--- a/plugins/gfm/src/main/kotlin/GfmPlugin.kt
+++ b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
@@ -1,32 +1,31 @@
-package org.jetbrains.dokka.commonmarkrenderer
+package org.jetbrains.dokka.gfm
 
 import org.jetbrains.dokka.CoreExtensions
+import org.jetbrains.dokka.base.DokkaBase
+import org.jetbrains.dokka.base.renderers.DefaultRenderer
+import org.jetbrains.dokka.base.renderers.OutputWriter
+import org.jetbrains.dokka.base.resolvers.local.DefaultLocationProvider
+import org.jetbrains.dokka.base.resolvers.local.LocationProviderFactory
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
 import java.lang.StringBuilder
 
 
-class CommonmarkRendererPlugin : DokkaPlugin() {
-
-    val locationProviderFactory by extensionPoint<LocationProviderFactory>()
-    val outputWriter by extensionPoint<OutputWriter>()
+class GfmPlugin : DokkaPlugin() {
 
     val renderer by extending {
-        CoreExtensions.renderer providing { CommonmarkRenderer(it.single(outputWriter), it) }
+        CoreExtensions.renderer providing { CommonmarkRenderer(it) } applyIf { format == "gfm" }
     }
 
     val locationProvider by extending {
-        locationProviderFactory providing { MarkdownLocationProviderFactory(it) } order {
-            before(renderer)
-        }
+        plugin<DokkaBase>().locationProviderFactory providing { MarkdownLocationProviderFactory(it) } applyIf { format == "gfm" }
     }
 }
 
-class CommonmarkRenderer(
-    outputWriter: OutputWriter,
+open class CommonmarkRenderer(
     context: DokkaContext
-) : DefaultRenderer<StringBuilder>(outputWriter, context) {
+) : DefaultRenderer<StringBuilder>(context) {
     override fun StringBuilder.buildHeader(level: Int, content: StringBuilder.() -> Unit) {
         buildParagraph()
         append("#".repeat(level) + " ")
@@ -84,14 +83,27 @@ class CommonmarkRenderer(
         append("\n\n")
     }
 
+    override fun StringBuilder.buildPlatformDependent(content: PlatformHintedContent, pageContext: ContentPage) {
+        val distinct = content.platforms.map {
+            it to "${StringBuilder().apply {buildContentNode(content.inner, pageContext, it) }.toString()}"
+        }.groupBy(Pair<PlatformData, String>::second, Pair<PlatformData, String>::first)
+
+        if (distinct.size == 1)
+            append(distinct.keys.single())
+        else
+            distinct.forEach { text, platforms ->
+                append(platforms.joinToString(prefix = " [", postfix = "] $text") { it.name })
+            }
+    }
+
     override fun StringBuilder.buildResource(node: ContentEmbeddedResource, pageContext: ContentPage) {
         append("Resource")
     }
 
     override fun StringBuilder.buildTable(node: ContentTable, pageContext: ContentPage, platformRestriction: PlatformData?) {
 
-        val size = node.children.firstOrNull()?.children?.size ?: 0
         buildParagraph()
+        val size = node.children.firstOrNull()?.children?.size ?: 0
 
         if (node.header.size > 0) {
             node.header.forEach {
@@ -116,12 +128,14 @@ class CommonmarkRenderer(
             }
             append("|\n")
         }
+
+        buildParagraph()
     }
 
     override fun StringBuilder.buildText(textNode: ContentText) {
         val decorators = decorators(textNode.style)
         append(decorators)
-        append(textNode.text.escapeIllegalCharacters())
+        append(textNode.text.replace(Regex("[<>]"), ""))
         append(decorators.reversed())
     }
 
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index 535a0aef..03fcfc58 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -1,8 +1,13 @@
 publishing {
     publications {
-        register<MavenPublication>("jekyll-plugin") {
+        register<MavenPublication>("jekyllPlugin") {
             artifactId = "jekyll-plugin"
             from(components["java"])
         }
     }
+}
+
+dependencies {
+    implementation(project(":plugins:base"))
+    implementation(project(":plugins:gfm"))
 }
\ No newline at end of file
diff --git a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
index 0a0a2cc4..c4f7f2c7 100644
--- a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
+++ b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
@@ -1,133 +1,23 @@
 package org.jetbrains.dokka.jekyll
 
 import org.jetbrains.dokka.CoreExtensions
+import org.jetbrains.dokka.gfm.CommonmarkRenderer
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
-import org.jetbrains.dokka.plugability.single
-import org.jetbrains.dokka.renderers.DefaultRenderer
-import org.jetbrains.dokka.renderers.OutputWriter
-import org.jetbrains.dokka.resolvers.DefaultLocationProvider
-import org.jetbrains.dokka.resolvers.LocationProvider
-import org.jetbrains.dokka.resolvers.LocationProviderFactory
 import java.lang.StringBuilder
 
 
 class JekyllPlugin : DokkaPlugin() {
 
     val renderer by extending {
-        CoreExtensions.renderer providing { JekyllRenderer(it.single(CoreExtensions.outputWriter), it) }
+        CoreExtensions.renderer providing { JekyllRenderer(it) } applyIf { format == "jekyll" }
     }
 }
 
 class JekyllRenderer(
-    outputWriter: OutputWriter,
     context: DokkaContext
-) : DefaultRenderer<StringBuilder>(outputWriter, context) {
-    override fun StringBuilder.buildHeader(level: Int, content: StringBuilder.() -> Unit) {
-        buildParagraph()
-        append("${"#".repeat(level)} ")
-        content()
-        buildNewLine()
-    }
-
-    override fun StringBuilder.buildLink(address: String, content: StringBuilder.() -> Unit) {
-        append("[")
-        content()
-        append("]($address)")
-    }
-
-    override fun StringBuilder.buildList(node: ContentList, pageContext: ContentPage) {
-        buildListLevel(node, pageContext)
-        buildParagraph()
-    }
-
-    private val indent = " ".repeat(4)
-
-    private fun StringBuilder.buildListItem(items: List<ContentNode>, pageContext: ContentPage, bullet: String = "*") {
-        items.forEach {
-            if(it is ContentList) {
-                val builder = StringBuilder()
-                builder.append(indent)
-                builder.buildListLevel(it, pageContext)
-                append(builder.toString().replace(Regex("  \n(?!$)"), "  \n$indent"))
-            } else {
-                append("$bullet ")
-                it.build(this, pageContext)
-                buildNewLine()
-            }
-        }
-    }
-
-    private fun StringBuilder.buildListLevel(node: ContentList, pageContext: ContentPage) {
-        if(node.ordered) {
-            buildListItem(node.children, pageContext, "${node.start}.")
-        } else {
-            buildListItem(node.children, pageContext, "*")
-        }
-    }
-
-    override fun StringBuilder.buildNewLine() {
-        this.append("  \n")
-    }
-
-    fun StringBuilder.buildParagraph() {
-        this.append("\n\n")
-    }
-
-    override fun StringBuilder.buildResource(node: ContentEmbeddedResource, pageContext: ContentPage) {
-        this.append("Resource")
-    }
-
-    override fun StringBuilder.buildTable(node: ContentTable, pageContext: ContentPage) {
-
-        buildParagraph()
-
-        val size = node.children.firstOrNull()?.children?.size ?: 0
-
-        if(node.header.size > 0) {
-            node.header.forEach {
-                it.children.forEach {
-                    append("| ")
-                    it.build(this, pageContext)
-                }
-                append("|\n")
-            }
-        } else {
-            append("| ".repeat(size))
-            if(size > 0) append("|\n")
-        }
-
-        append("|---".repeat(size))
-        if(size > 0) append("|\n")
-
-
-        node.children.forEach {
-            it.children.forEach {
-                append("| ")
-                it.build(this,  pageContext)
-            }
-            append("|\n")
-        }
-
-        buildParagraph()
-    }
-
-    override fun StringBuilder.buildText(textNode: ContentText) {
-        val decorators = decorators(textNode.style)
-        this.append(decorators)
-        this.append(textNode.text.replace(Regex("[<>]"), ""))
-        this.append(decorators.reversed())
-    }
-
-    override fun StringBuilder.buildNavigation(page: PageNode) {
-        locationProvider.ancestors(page).asReversed().forEach { node ->
-            append("/")
-            if (node.isNavigable) buildLink(node, page)
-            else append(node.name)
-        }
-        buildParagraph()
-    }
+) : CommonmarkRenderer(context) {
 
     override fun buildPage(page: ContentPage, content: (StringBuilder, ContentPage) -> Unit): String {
         val builder = StringBuilder()
@@ -137,46 +27,4 @@ class JekyllRenderer(
         content(builder, page)
         return builder.toString()
     }
-
-    override fun buildError(node: ContentNode) {
-        println("Error")
-    }
-
-    private fun decorators(styles: Set<Style>): String {
-        val decorators = StringBuilder()
-        styles.forEach {
-            when(it) {
-                TextStyle.Bold          -> decorators.append("**")
-                TextStyle.Italic        -> decorators.append("*")
-                TextStyle.Strong        -> decorators.append("**")
-                TextStyle.Strikethrough -> decorators.append("~~")
-                else                    -> Unit
-            }
-        }
-        return decorators.toString()
-    }
-
-    private val PageNode.isNavigable: Boolean
-        get() = this !is RendererSpecificPage || strategy != RenderingStrategy.DoNothing
-
-    private fun StringBuilder.buildLink(to: PageNode, from: PageNode) =
-        buildLink(locationProvider.resolve(to, from)) {
-            append(to.name)
-        }
-
-    override fun renderPage(page: PageNode) {
-        val path by lazy { locationProvider.resolve(page, skipExtension = true) }
-        when (page) {
-            is ContentPage -> outputWriter.write(path, buildPage(page) { c, p -> buildPageContent(c, p) }, ".md")
-            is RendererSpecificPage -> when (val strategy = page.strategy) {
-                is RenderingStrategy.Copy -> outputWriter.writeResources(strategy.from, path)
-                is RenderingStrategy.Write -> outputWriter.write(path, strategy.text, "")
-                is RenderingStrategy.Callback -> outputWriter.write(path, strategy.instructions(this, page), ".md")
-                RenderingStrategy.DoNothing -> Unit
-            }
-            else -> throw AssertionError(
-                "Page ${page.name} cannot be rendered by renderer as it is not renderer specific nor contains content"
-            )
-        }
-    }
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8b4d4050..56c122f8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,6 +9,8 @@ include("runners:cli")
 include("runners:maven-plugin")
 include("plugins:base")
 include("plugins:mathjax")
+include("plugins:gfm")
+include("plugins:jekyll")
 include("plugins:kotlin-as-java")
 include("integration-tests:gradle-integration-tests")
 
-- 
cgit 


From 3cd12e14d7465c197d4a6fc76d073328a46db349 Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Fri, 17 Apr 2020 16:49:47 +0200
Subject: Fix problem with base plugin not being loaded in gradle runner

---
 plugins/gfm/build.gradle.kts                                            | 2 +-
 plugins/jekyll/build.gradle.kts                                         | 2 +-
 .../gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/jekyll/build.gradle.kts')

diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index c0226345..ffa12cba 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -8,5 +8,5 @@ publishing {
 }
 
 dependencies {
-    implementation(project(":plugins:base"))
+    compileOnly(project(":plugins:base"))
 }
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index 03fcfc58..a5c10fa0 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -8,6 +8,6 @@ publishing {
 }
 
 dependencies {
-    implementation(project(":plugins:base"))
+    compileOnly(project(":plugins:base"))
     implementation(project(":plugins:gfm"))
 }
\ No newline at end of file
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt
index 4efc5010..2ece238f 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt
@@ -19,7 +19,7 @@ open class DokkaPlugin : Plugin<Project> {
         loadDokkaVersion()
         val dokkaRuntimeConfiguration = addConfiguration(project)
         val pluginsConfiguration = project.configurations.create("dokkaPlugins").apply {
-            defaultDependencies { it.add(project.dependencies.create("org.jetbrains.dokka:dokka-base:${DokkaVersion.version}")) }
+            dependencies.add(project.dependencies.create("org.jetbrains.dokka:dokka-base:${DokkaVersion.version}"))
         }
         addDokkaTasks(project, dokkaRuntimeConfiguration, pluginsConfiguration, DokkaTask::class.java)
         addDokkaCollectorTasks(project, DokkaCollectorTask::class.java)
-- 
cgit 


From 1b8030d4b8d4b83e35c91632694fb32fcb58a02d Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Wed, 8 Jul 2020 17:09:41 +0200
Subject: Implement PublicationValidation

---
 build.gradle.kts                                   |  6 +-
 .../main/kotlin/org/jetbrains/BintrayPublishing.kt |  4 +-
 .../src/main/kotlin/org/jetbrains/DokkaVersion.kt  |  3 +
 .../kotlin/org/jetbrains/ValidatePublications.kt   | 79 ++++++++++++++++++++++
 plugins/gfm/build.gradle.kts                       |  4 ++
 plugins/javadoc/build.gradle.kts                   |  1 -
 plugins/jekyll/build.gradle.kts                    |  6 +-
 plugins/mathjax/build.gradle.kts                   |  6 +-
 runners/gradle-plugin/build.gradle.kts             |  2 +-
 9 files changed, 104 insertions(+), 7 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/org/jetbrains/ValidatePublications.kt

(limited to 'plugins/jekyll/build.gradle.kts')

diff --git a/build.gradle.kts b/build.gradle.kts
index ee17ba75..7cc0394f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.ValidatePublications
 import org.jetbrains.configureDokkaVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -45,8 +46,6 @@ subprojects {
     }
 }
 
-println("Publication version: $dokka_version")
-
 // Workaround for https://github.com/bintray/gradle-bintray-plugin/issues/267
 //  Manually disable bintray tasks added to the root project
 tasks.whenTaskAdded {
@@ -54,3 +53,6 @@ tasks.whenTaskAdded {
         enabled = false
     }
 }
+
+println("Publication version: $dokka_version")
+tasks.register<ValidatePublications>("validatePublications")
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt b/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt
index c3d21d88..4180c445 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt
@@ -10,7 +10,8 @@ fun Project.configureBintrayPublication(vararg publications: String) {
     extensions.configure<BintrayExtension>("bintray") {
         user = System.getenv("BINTRAY_USER")
         key = System.getenv("BINTRAY_KEY")
-
+        dryRun = System.getenv("BINTRAY_DRY_RUN") == "true" ||
+                project.properties["bintray_dry_run"] == "true"
         pkg = PackageConfig().apply {
             repo = dokka_publication_channel
             name = "dokka"
@@ -25,3 +26,4 @@ fun Project.configureBintrayPublication(vararg publications: String) {
         setPublications(*publications)
     }
 }
+
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt b/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt
index d5fd3e78..2a5c21a7 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt
@@ -21,3 +21,6 @@ private fun dokkaVersionFromBase(baseVersion: String): String {
     }
     return "$baseVersion-$buildNumber"
 }
+
+val Project.dokkaVersion: String
+    get() = configureDokkaVersion()
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/ValidatePublications.kt b/buildSrc/src/main/kotlin/org/jetbrains/ValidatePublications.kt
new file mode 100644
index 00000000..84c48b96
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/jetbrains/ValidatePublications.kt
@@ -0,0 +1,79 @@
+package org.jetbrains
+
+import com.jfrog.bintray.gradle.BintrayExtension
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+import org.gradle.api.artifacts.ProjectDependency
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.findByType
+import org.gradle.kotlin.dsl.provideDelegate
+
+open class ValidatePublications : DefaultTask() {
+    class MissingBintrayPublicationException(project: Project, publication: MavenPublication) : GradleException(
+        "Project ${project.path} has publication ${publication.name} that is not configured for bintray publication"
+    )
+
+    class UnpublishedProjectDependencyException(
+        project: Project, dependencyProject: Project
+    ) : GradleException(
+        "Published project ${project.path} cannot depend on unpublished projed ${dependencyProject.path}"
+    )
+
+
+    @TaskAction
+    fun validatePublicationConfiguration() {
+        @Suppress("LocalVariableName")
+        project.subprojects.forEach { subProject ->
+            val publishing = subProject.extensions.findByType<PublishingExtension>() ?: return@forEach
+            publishing.publications
+                .filterIsInstance<MavenPublication>()
+                .filter { it.version == project.dokkaVersion }
+                .forEach { publication ->
+                    checkPublicationIsConfiguredForBintray(subProject, publication)
+                    checkProjectDependenciesArePublished(subProject)
+                }
+        }
+    }
+
+    private fun checkPublicationIsConfiguredForBintray(project: Project, publication: MavenPublication) {
+        val bintrayExtension = project.extensions.findByType<BintrayExtension>()
+            ?: throw MissingBintrayPublicationException(project, publication)
+
+        val isPublicationConfiguredForBintray = bintrayExtension.publications.orEmpty()
+            .any { publicationName -> publicationName == publication.name }
+
+        if (!isPublicationConfiguredForBintray) {
+            throw MissingBintrayPublicationException(project, publication)
+        }
+    }
+
+    private fun checkProjectDependenciesArePublished(project: Project) {
+        (project.configurations.findByName("implementation")?.allDependencies.orEmpty() +
+                project.configurations.findByName("api")?.allDependencies.orEmpty())
+            .filterIsInstance<ProjectDependency>()
+            .forEach { projectDependency ->
+                val publishing = projectDependency.dependencyProject.extensions.findByType<PublishingExtension>()
+                    ?: throw UnpublishedProjectDependencyException(
+                        project = project, dependencyProject = projectDependency.dependencyProject
+                    )
+
+                val isPublished = publishing.publications.filterIsInstance<MavenPublication>()
+                    .filter { it.version == project.dokkaVersion }
+                    .any()
+
+                if (!isPublished) {
+                    throw UnpublishedProjectDependencyException(project, projectDependency.dependencyProject)
+                }
+            }
+    }
+
+    init {
+        group = "verification"
+        project.tasks.named("check") {
+            dependsOn(this@ValidatePublications)
+        }
+    }
+}
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index 2addd9c9..16b318fb 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.configureBintrayPublication
+
 publishing {
     publications {
         register<MavenPublication>("gfmPlugin") {
@@ -7,6 +9,8 @@ publishing {
     }
 }
 
+configureBintrayPublication("gfmPlugin")
+
 dependencies {
     compileOnly(project(":plugins:base"))
     testImplementation(project(":plugins:base"))
diff --git a/plugins/javadoc/build.gradle.kts b/plugins/javadoc/build.gradle.kts
index 4c5c22b0..ebf79f8f 100644
--- a/plugins/javadoc/build.gradle.kts
+++ b/plugins/javadoc/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.configureBintrayPublication
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 publishing {
     publications {
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index a5c10fa0..b47633db 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.configureBintrayPublication
+
 publishing {
     publications {
         register<MavenPublication>("jekyllPlugin") {
@@ -7,7 +9,9 @@ publishing {
     }
 }
 
+configureBintrayPublication("jekyllPlugin")
+
 dependencies {
     compileOnly(project(":plugins:base"))
     implementation(project(":plugins:gfm"))
-}
\ No newline at end of file
+}
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
index 0e9a16d0..67f4822f 100644
--- a/plugins/mathjax/build.gradle.kts
+++ b/plugins/mathjax/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.configureBintrayPublication
+
 publishing {
     publications {
         register<MavenPublication>("mathjaxPlugin") {
@@ -5,4 +7,6 @@ publishing {
             from(components["java"])
         }
     }
-}
\ No newline at end of file
+}
+
+configureBintrayPublication("mathjaxPlugin")
diff --git a/runners/gradle-plugin/build.gradle.kts b/runners/gradle-plugin/build.gradle.kts
index 77fbe4a7..a8345652 100644
--- a/runners/gradle-plugin/build.gradle.kts
+++ b/runners/gradle-plugin/build.gradle.kts
@@ -81,4 +81,4 @@ pluginBundle {
     }
 }
 
-configureBintrayPublication("dokkaGradlePlugin", "dokkaGradlePluginPluginMarkerMaven")
+configureBintrayPublication("dokkaGradlePlugin", "pluginMaven", "dokkaGradlePluginPluginMarkerMaven")
-- 
cgit 


From 663b2f4106347d413242e369f10eb30a27e908c5 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Fri, 10 Jul 2020 08:58:05 +0200
Subject: Support dokkaJekyll and dokkaGfm tasks in new task configuration

---
 plugins/gfm/build.gradle.kts                   | 2 +-
 plugins/jekyll/build.gradle.kts                | 2 +-
 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'plugins/jekyll/build.gradle.kts')

diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index 16b318fb..fac2c1c0 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -12,7 +12,7 @@ publishing {
 configureBintrayPublication("gfmPlugin")
 
 dependencies {
-    compileOnly(project(":plugins:base"))
+    implementation(project(":plugins:base"))
     testImplementation(project(":plugins:base"))
     testImplementation(project(":plugins:base:test-utils"))
 }
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index b47633db..90002466 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -12,6 +12,6 @@ publishing {
 configureBintrayPublication("jekyllPlugin")
 
 dependencies {
-    compileOnly(project(":plugins:base"))
+    implementation(project(":plugins:base"))
     implementation(project(":plugins:gfm"))
 }
diff --git a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
index f6ea894c..84c22eae 100644
--- a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
+++ b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
@@ -5,6 +5,7 @@ import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.renderers.PackageListCreator
 import org.jetbrains.dokka.base.renderers.RootCreator
 import org.jetbrains.dokka.gfm.CommonmarkRenderer
+import org.jetbrains.dokka.gfm.GfmPlugin
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
@@ -21,7 +22,8 @@ class JekyllPlugin : DokkaPlugin() {
     val renderer by extending {
         (CoreExtensions.renderer
                 providing { JekyllRenderer(it) }
-                override plugin<DokkaBase>().htmlRenderer)
+                // TODO NOW: Is this correct?
+                override plugin<GfmPlugin>().renderer)
     }
 
     val rootCreator by extending {
-- 
cgit 


From 7001425367a4db79c6fcdf6b8d0c53508ba50aa7 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Mon, 13 Jul 2020 18:33:28 -0700
Subject: Simplify publishing configuration and enable sourcejars

---
 .../org/jetbrains/PublicationConfiguration.kt      | 34 ++++++++++++++++++++++
 core/build.gradle.kts                              | 19 ++----------
 core/dependencies/build.gradle.kts                 | 13 ++-------
 kotlin-analysis/build.gradle.kts                   | 13 ++-------
 kotlin-analysis/dependencies/build.gradle.kts      | 15 ++--------
 plugins/base/build.gradle.kts                      | 13 ++-------
 plugins/gfm/build.gradle.kts                       | 15 ++--------
 plugins/javadoc/build.gradle.kts                   | 13 ++-------
 plugins/jekyll/build.gradle.kts                    | 15 ++--------
 plugins/kotlin-as-java/build.gradle.kts            | 13 ++-------
 plugins/mathjax/build.gradle.kts                   | 13 ++-------
 plugins/xml/build.gradle.kts                       | 11 ++-----
 runners/cli/build.gradle.kts                       | 13 ++-------
 runners/maven-plugin/build.gradle.kts              | 15 ++--------
 testApi/build.gradle.kts                           | 19 ++----------
 15 files changed, 65 insertions(+), 169 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/org/jetbrains/PublicationConfiguration.kt

(limited to 'plugins/jekyll/build.gradle.kts')

diff --git a/buildSrc/src/main/kotlin/org/jetbrains/PublicationConfiguration.kt b/buildSrc/src/main/kotlin/org/jetbrains/PublicationConfiguration.kt
new file mode 100644
index 00000000..5dbb8fb9
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/jetbrains/PublicationConfiguration.kt
@@ -0,0 +1,34 @@
+package org.jetbrains
+
+import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.get
+
+fun Project.configurePublication(artifactId: String, useShadow: Boolean = false) {
+    configure<PublishingExtension> {
+        publications {
+            create<MavenPublication>("maven") {
+                this.artifactId = artifactId
+                if (useShadow) {
+                    val shadow = extensions.getByType(ShadowExtension::class.java)
+                    shadow.component(this)
+                } else {
+                    from(components["java"])
+                }
+            }
+        }
+    }
+    configureBintrayPublication("maven")
+    plugins.all {
+        if (this is JavaPlugin) {
+            val extension = extensions.getByType(JavaPluginExtension::class.java)
+            @Suppress("UnstableApiUsage") extension.withSourcesJar()
+        }
+    }
+}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 45ddccf3..030db5c6 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configureBintrayPublication
+import org.jetbrains.configurePublication
 
 plugins {
     `maven-publish`
@@ -16,11 +16,6 @@ dependencies {
     testImplementation(kotlin("test-junit"))
 }
 
-val sourceJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("sources")
-    from(sourceSets["main"].allSource)
-}
-
 tasks {
     processResources {
         val dokka_version: String by project
@@ -34,14 +29,4 @@ tasks {
     }
 }
 
-publishing {
-    publications {
-        register<MavenPublication>("dokkaCore") {
-            artifactId = "dokka-core"
-            from(components["java"])
-            artifact(sourceJar.get())
-        }
-    }
-}
-
-configureBintrayPublication("dokkaCore")
+configurePublication("dokka-core")
diff --git a/core/dependencies/build.gradle.kts b/core/dependencies/build.gradle.kts
index a26d109e..082861b6 100644
--- a/core/dependencies/build.gradle.kts
+++ b/core/dependencies/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configureBintrayPublication
+import org.jetbrains.configurePublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
@@ -28,13 +28,4 @@ tasks {
     }
 }
 
-publishing {
-    publications {
-        register<MavenPublication>("dokkaCoreDependencies") {
-            artifactId = "dokka-core-dependencies"
-            project.shadow.component(this)
-        }
-    }
-}
-
-configureBintrayPublication("dokkaCoreDependencies")
+configurePublication("dokka-core-dependencies", useShadow = true)
diff --git a/kotlin-analysis/build.gradle.kts b/kotlin-analysis/build.gradle.kts
index 67480f82..5acc1f06 100644
--- a/kotlin-analysis/build.gradle.kts
+++ b/kotlin-analysis/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configureBintrayPublication
+import org.jetbrains.configurePublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
@@ -15,13 +15,4 @@ dependencies {
     api(project(":kotlin-analysis:dependencies", configuration = "shadow"))
 }
 
-publishing {
-    publications {
-        register<MavenPublication>("analysis") {
-            artifactId = "dokka-analysis"
-            from(components["java"])
-        }
-    }
-}
-
-configureBintrayPublication("analysis")
+configurePublication("dokka-analysis")
diff --git a/kotlin-analysis/dependencies/build.gradle.kts b/kotlin-analysis/dependencies/build.gradle.kts
index 5bba6422..1fd13630 100644
--- a/kotlin-analysis/dependencies/build.gradle.kts
+++ b/kotlin-analysis/dependencies/build.gradle.kts
@@ -1,5 +1,4 @@
-import org.jetbrains.configureBintrayPublication
-
+import org.jetbrains.configurePublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
@@ -54,14 +53,4 @@ tasks {
     }
 }
 
-
-publishing {
-    publications {
-        register<MavenPublication>("kotlin-analysis-dependencies") {
-            artifactId = "kotlin-analysis-dependencies"
-            project.shadow.component(this)
-        }
-    }
-}
-
-configureBintrayPublication("kotlin-analysis-dependencies")
+configurePublication("kotlin-analysis-dependencies", useShadow = true)
diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts
index 1fe3dbc2..61e2ef01 100644
--- a/plugins/base/build.gradle.kts
+++ b/plugins/base/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configureBintrayPublication
+import org.jetbrains.configurePublication
 
 plugins {
     id("com.jfrog.bintray")
@@ -30,13 +30,4 @@ tasks {
     }
 }
 
-publishing {
-    publications {
-        register<MavenPublication>("basePlugin") {
-            artifactId = "dokka-base"
-            from(components["java"])
-        }
-    }
-}
-
-configureBintrayPublication("basePlugin")
+configurePublication("dokka-base")
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index fac2c1c0..73958046 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -1,18 +1,9 @@
-import org.jetbrains.configureBintrayPublication
-
-publishing {
-    publications {
-        register<MavenPublication>("gfmPlugin") {
-            artifactId = "gfm-plugin"
-            from(components["java"])
-        }
-    }
-}
-
-configureBintrayPublication("gfmPlugin")
+import org.jetbrains.configurePublication
 
 dependencies {
     implementation(project(":plugins:base"))
     testImplementation(project(":plugins:base"))
     testImplementation(project(":plugins:base:test-utils"))
 }
+
+configurePublication("gfm-plugin")
diff --git a/plugins/javadoc/build.gradle.kts b/plugins/javadoc/build.gradle.kts
index ebf79f8f..5846ee62 100644
--- a/plugins/javadoc/build.gradle.kts
+++ b/plugins/javadoc/build.gradle.kts
@@ -1,13 +1,4 @@
-import org.jetbrains.configureBintrayPublication
-
-publishing {
-    publications {
-        register<MavenPublication>("javadocPlugin") {
-            artifactId = "javadoc-plugin"
-            from(components["java"])
-        }
-    }
-}
+import org.jetbrains.configurePublication
 
 dependencies {
     implementation("com.soywiz.korlibs.korte:korte-jvm:1.10.3")
@@ -19,4 +10,4 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
 }
 
-configureBintrayPublication("javadocPlugin")
+configurePublication("javadoc-plugin")
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index 90002466..0d1e38d6 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -1,17 +1,8 @@
-import org.jetbrains.configureBintrayPublication
-
-publishing {
-    publications {
-        register<MavenPublication>("jekyllPlugin") {
-            artifactId = "jekyll-plugin"
-            from(components["java"])
-        }
-    }
-}
-
-configureBintrayPublication("jekyllPlugin")
+import org.jetbrains.configurePublication
 
 dependencies {
     implementation(project(":plugins:base"))
     implementation(project(":plugins:gfm"))
 }
+
+configurePublication("jekyll-plugin")
diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index bd08ab92..27e90f84 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -1,13 +1,4 @@
-import org.jetbrains.configureBintrayPublication
-
-publishing {
-    publications {
-        register<MavenPublication>("kotlinAsJavaPlugin") {
-            artifactId = "kotlin-as-java-plugin"
-            from(components["java"])
-        }
-    }
-}
+import org.jetbrains.configurePublication
 
 dependencies {
     implementation(project(":plugins:base"))
@@ -16,4 +7,4 @@ dependencies {
     testImplementation(project(":test-tools"))
 }
 
-configureBintrayPublication("kotlinAsJavaPlugin")
\ No newline at end of file
+configurePublication("kotlin-as-java-plugin")
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
index 67f4822f..ea4cdff0 100644
--- a/plugins/mathjax/build.gradle.kts
+++ b/plugins/mathjax/build.gradle.kts
@@ -1,12 +1,3 @@
-import org.jetbrains.configureBintrayPublication
+import org.jetbrains.configurePublication
 
-publishing {
-    publications {
-        register<MavenPublication>("mathjaxPlugin") {
-            artifactId = "mathjax-plugin"
-            from(components["java"])
-        }
-    }
-}
-
-configureBintrayPublication("mathjaxPlugin")
+configurePublication("mathjax-plugin")
diff --git a/plugins/xml/build.gradle.kts b/plugins/xml/build.gradle.kts
index cd65cfe4..5d3984bc 100644
--- a/plugins/xml/build.gradle.kts
+++ b/plugins/xml/build.gradle.kts
@@ -1,8 +1,3 @@
-publishing {
-    publications {
-        register<MavenPublication>("xmlPlugin") {
-            artifactId = "xml-plugin"
-            from(components["java"])
-        }
-    }
-}
\ No newline at end of file
+import org.jetbrains.configurePublication
+
+configurePublication("xml-plugin")
\ No newline at end of file
diff --git a/runners/cli/build.gradle.kts b/runners/cli/build.gradle.kts
index 00e459b2..19a49346 100644
--- a/runners/cli/build.gradle.kts
+++ b/runners/cli/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configureBintrayPublication
+import org.jetbrains.configurePublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
@@ -15,7 +15,6 @@ dependencies {
     implementation(kotlin("stdlib"))
 }
 
-
 tasks {
     shadowJar {
         val dokka_version: String by project
@@ -27,13 +26,5 @@ tasks {
     }
 }
 
-publishing {
-    publications {
-        register<MavenPublication>("dokkaCli") {
-            artifactId = "dokka-cli"
-            project.shadow.component(this)
-        }
-    }
-}
+configurePublication("dokka-cli", useShadow = true)
 
-configureBintrayPublication("dokkaCli")
diff --git a/runners/maven-plugin/build.gradle.kts b/runners/maven-plugin/build.gradle.kts
index 6214da6d..83d9f5af 100644
--- a/runners/maven-plugin/build.gradle.kts
+++ b/runners/maven-plugin/build.gradle.kts
@@ -1,7 +1,6 @@
-import org.jetbrains.configureBintrayPublication
 import org.jetbrains.CrossPlatformExec
 import org.jetbrains.SetupMaven
-
+import org.jetbrains.configurePublication
 
 val setupMaven by tasks.register<SetupMaven>("setupMaven")
 
@@ -91,14 +90,4 @@ tasks.named<Jar>("jar") {
     }
 }
 
-publishing {
-    publications {
-        register<MavenPublication>("dokkaMavenPlugin") {
-            artifactId = "dokka-maven-plugin"
-            from(components["java"])
-            artifact(sourceJar.get())
-        }
-    }
-}
-
-configureBintrayPublication("dokkaMavenPlugin")
+configurePublication("dokka-maven-plugin")
diff --git a/testApi/build.gradle.kts b/testApi/build.gradle.kts
index c8b510a1..1576dd99 100644
--- a/testApi/build.gradle.kts
+++ b/testApi/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configureBintrayPublication
+import org.jetbrains.configurePublication
 
 plugins {
     `maven-publish`
@@ -13,19 +13,4 @@ dependencies {
     implementation(kotlin("reflect"))
 }
 
-val sourceJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("sources")
-    from(sourceSets["main"].allSource)
-}
-
-publishing {
-    publications {
-        register<MavenPublication>("dokkaTestAPI") {
-            artifactId = "dokka-test-api"
-            from(components["java"])
-            artifact(sourceJar.get())
-        }
-    }
-}
-
-configureBintrayPublication("dokkaTestAPI")
\ No newline at end of file
+configurePublication("dokka-test-api")
-- 
cgit 


From 7ff409fdf621932590dbf0118fff2c73dc76b951 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Tue, 14 Jul 2020 10:06:04 +0200
Subject: Adapt changes from "Simplify publishing configuration and enable
 sourcejars"

---
 build.gradle.kts                                   |  2 +
 .../main/kotlin/org/jetbrains/BintrayPublishing.kt | 29 -----------
 .../org/jetbrains/PublicationConfiguration.kt      | 34 -------------
 .../src/main/kotlin/org/jetbrains/publication.kt   | 58 ++++++++++++++++++++++
 core/build.gradle.kts                              |  6 ++-
 core/dependencies/build.gradle.kts                 |  8 ++-
 kotlin-analysis/build.gradle.kts                   |  6 ++-
 kotlin-analysis/dependencies/build.gradle.kts      |  8 ++-
 plugins/base/build.gradle.kts                      |  6 ++-
 plugins/gfm/build.gradle.kts                       |  6 ++-
 plugins/javadoc/build.gradle.kts                   |  6 ++-
 plugins/jekyll/build.gradle.kts                    |  6 ++-
 plugins/kotlin-as-java/build.gradle.kts            |  6 ++-
 plugins/mathjax/build.gradle.kts                   |  6 ++-
 runners/cli/build.gradle.kts                       |  8 ++-
 runners/gradle-plugin/build.gradle.kts             |  4 +-
 runners/maven-plugin/build.gradle.kts              | 11 ++--
 testApi/build.gradle.kts                           |  6 ++-
 18 files changed, 123 insertions(+), 93 deletions(-)
 delete mode 100644 buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt
 delete mode 100644 buildSrc/src/main/kotlin/org/jetbrains/PublicationConfiguration.kt
 create mode 100644 buildSrc/src/main/kotlin/org/jetbrains/publication.kt

(limited to 'plugins/jekyll/build.gradle.kts')

diff --git a/build.gradle.kts b/build.gradle.kts
index 7cc0394f..c6335a31 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,6 +42,8 @@ subprojects {
 
     // Gradle metadata
     java {
+        @Suppress("UnstableApiUsage")
+        withSourcesJar()
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt b/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt
deleted file mode 100644
index 4180c445..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jetbrains
-
-import com.jfrog.bintray.gradle.BintrayExtension
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.provideDelegate
-
-fun Project.configureBintrayPublication(vararg publications: String) {
-    val dokka_version: String by this
-    val dokka_publication_channel: String by this
-    extensions.configure<BintrayExtension>("bintray") {
-        user = System.getenv("BINTRAY_USER")
-        key = System.getenv("BINTRAY_KEY")
-        dryRun = System.getenv("BINTRAY_DRY_RUN") == "true" ||
-                project.properties["bintray_dry_run"] == "true"
-        pkg = PackageConfig().apply {
-            repo = dokka_publication_channel
-            name = "dokka"
-            userOrg = "kotlin"
-            desc = "Dokka, the Kotlin documentation tool"
-            vcsUrl = "https://github.com/kotlin/dokka.git"
-            setLicenses("Apache-2.0")
-            version = VersionConfig().apply {
-                name = dokka_version
-            }
-        }
-        setPublications(*publications)
-    }
-}
-
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/PublicationConfiguration.kt b/buildSrc/src/main/kotlin/org/jetbrains/PublicationConfiguration.kt
deleted file mode 100644
index 5dbb8fb9..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/PublicationConfiguration.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.jetbrains
-
-import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.create
-import org.gradle.kotlin.dsl.get
-
-fun Project.configurePublication(artifactId: String, useShadow: Boolean = false) {
-    configure<PublishingExtension> {
-        publications {
-            create<MavenPublication>("maven") {
-                this.artifactId = artifactId
-                if (useShadow) {
-                    val shadow = extensions.getByType(ShadowExtension::class.java)
-                    shadow.component(this)
-                } else {
-                    from(components["java"])
-                }
-            }
-        }
-    }
-    configureBintrayPublication("maven")
-    plugins.all {
-        if (this is JavaPlugin) {
-            val extension = extensions.getByType(JavaPluginExtension::class.java)
-            @Suppress("UnstableApiUsage") extension.withSourcesJar()
-        }
-    }
-}
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/publication.kt b/buildSrc/src/main/kotlin/org/jetbrains/publication.kt
new file mode 100644
index 00000000..47fb23f2
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/jetbrains/publication.kt
@@ -0,0 +1,58 @@
+package org.jetbrains
+
+import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
+import com.jfrog.bintray.gradle.BintrayExtension
+import org.gradle.api.Project
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.*
+
+class DokkaPublicationBuilder {
+    enum class Component {
+        Java, Shadow
+    }
+    var artifactId: String? = null
+    var component: Component = Component.Java
+}
+
+fun Project.registerDokkaArtifactPublication(publicationName: String, configure: DokkaPublicationBuilder.() -> Unit) {
+    configure<PublishingExtension> {
+        publications {
+            register<MavenPublication>(publicationName) {
+                val builder = DokkaPublicationBuilder().apply(configure)
+                this.artifactId = builder.artifactId
+                when (builder.component) {
+                    DokkaPublicationBuilder.Component.Java -> from(components["java"])
+                    DokkaPublicationBuilder.Component.Shadow ->
+                        extensions.getByType(ShadowExtension::class.java).component(this)
+                }
+            }
+        }
+    }
+
+    configureBintrayPublication(publicationName)
+}
+
+fun Project.configureBintrayPublication(vararg publications: String) {
+    val dokka_version: String by this
+    val dokka_publication_channel: String by this
+    extensions.configure<BintrayExtension>("bintray") {
+        user = System.getenv("BINTRAY_USER")
+        key = System.getenv("BINTRAY_KEY")
+        dryRun = System.getenv("BINTRAY_DRY_RUN") == "true" ||
+                project.properties["bintray_dry_run"] == "true"
+        pkg = PackageConfig().apply {
+            repo = dokka_publication_channel
+            name = "dokka"
+            userOrg = "kotlin"
+            desc = "Dokka, the Kotlin documentation tool"
+            vcsUrl = "https://github.com/kotlin/dokka.git"
+            setLicenses("Apache-2.0")
+            version = VersionConfig().apply {
+                name = dokka_version
+            }
+        }
+        setPublications(*publications)
+    }
+}
+
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 030db5c6..b52d3729 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
     `maven-publish`
@@ -29,4 +29,6 @@ tasks {
     }
 }
 
-configurePublication("dokka-core")
+registerDokkaArtifactPublication("dokkaCore") {
+    artifactId = "dokka-core"
+}
diff --git a/core/dependencies/build.gradle.kts b/core/dependencies/build.gradle.kts
index 082861b6..a074958d 100644
--- a/core/dependencies/build.gradle.kts
+++ b/core/dependencies/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.DokkaPublicationBuilder.Component.Shadow
+import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
@@ -28,4 +29,7 @@ tasks {
     }
 }
 
-configurePublication("dokka-core-dependencies", useShadow = true)
+registerDokkaArtifactPublication("dokkaCoreDependencies") {
+    artifactId = "dokka-core-dependencies"
+    component = Shadow
+}
diff --git a/kotlin-analysis/build.gradle.kts b/kotlin-analysis/build.gradle.kts
index 5acc1f06..f87811e1 100644
--- a/kotlin-analysis/build.gradle.kts
+++ b/kotlin-analysis/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
@@ -15,4 +15,6 @@ dependencies {
     api(project(":kotlin-analysis:dependencies", configuration = "shadow"))
 }
 
-configurePublication("dokka-analysis")
+registerDokkaArtifactPublication("dokkaAnalysis") {
+    artifactId = "dokka-analysis"
+}
diff --git a/kotlin-analysis/dependencies/build.gradle.kts b/kotlin-analysis/dependencies/build.gradle.kts
index 1fd13630..4aba6614 100644
--- a/kotlin-analysis/dependencies/build.gradle.kts
+++ b/kotlin-analysis/dependencies/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.DokkaPublicationBuilder.Component.Shadow
+import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
@@ -53,4 +54,7 @@ tasks {
     }
 }
 
-configurePublication("kotlin-analysis-dependencies", useShadow = true)
+registerDokkaArtifactPublication("kotlinAnalysisDependencies"){
+    artifactId = "kotlin-analysis-dependencies"
+    component = Shadow
+}
diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts
index 61e2ef01..0fc7f55c 100644
--- a/plugins/base/build.gradle.kts
+++ b/plugins/base/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
     id("com.jfrog.bintray")
@@ -30,4 +30,6 @@ tasks {
     }
 }
 
-configurePublication("dokka-base")
+registerDokkaArtifactPublication("dokkaBase") {
+    artifactId = "dokka-base"
+}
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index 73958046..3f69043d 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 dependencies {
     implementation(project(":plugins:base"))
@@ -6,4 +6,6 @@ dependencies {
     testImplementation(project(":plugins:base:test-utils"))
 }
 
-configurePublication("gfm-plugin")
+registerDokkaArtifactPublication("gfmPlugin") {
+    artifactId = "gfm-plugin"
+}
diff --git a/plugins/javadoc/build.gradle.kts b/plugins/javadoc/build.gradle.kts
index 5846ee62..5e2e5600 100644
--- a/plugins/javadoc/build.gradle.kts
+++ b/plugins/javadoc/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 dependencies {
     implementation("com.soywiz.korlibs.korte:korte-jvm:1.10.3")
@@ -10,4 +10,6 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
 }
 
-configurePublication("javadoc-plugin")
+registerDokkaArtifactPublication("javadocPlugin") {
+    artifactId = "javadoc-plugin"
+}
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index 0d1e38d6..64cf9800 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -1,8 +1,10 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 dependencies {
     implementation(project(":plugins:base"))
     implementation(project(":plugins:gfm"))
 }
 
-configurePublication("jekyll-plugin")
+registerDokkaArtifactPublication("jekyllPlugin") {
+    artifactId = "jekyll-plugin"
+}
diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index 27e90f84..eda6114f 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 dependencies {
     implementation(project(":plugins:base"))
@@ -7,4 +7,6 @@ dependencies {
     testImplementation(project(":test-tools"))
 }
 
-configurePublication("kotlin-as-java-plugin")
+registerDokkaArtifactPublication("kotlinAsJavaPlugin") {
+    artifactId = "kotlin-as-java-plugin"
+}
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
index ea4cdff0..142e7dc4 100644
--- a/plugins/mathjax/build.gradle.kts
+++ b/plugins/mathjax/build.gradle.kts
@@ -1,3 +1,5 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
-configurePublication("mathjax-plugin")
+registerDokkaArtifactPublication("mathjaxPlugin") {
+    artifactId = "mathjax-plugin"
+}
diff --git a/runners/cli/build.gradle.kts b/runners/cli/build.gradle.kts
index 19a49346..4ad34192 100644
--- a/runners/cli/build.gradle.kts
+++ b/runners/cli/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.DokkaPublicationBuilder.Component.Shadow
+import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
@@ -26,5 +27,8 @@ tasks {
     }
 }
 
-configurePublication("dokka-cli", useShadow = true)
+registerDokkaArtifactPublication("dokkaCli"){
+    artifactId = "dokka-cli"
+    component = Shadow
+}
 
diff --git a/runners/gradle-plugin/build.gradle.kts b/runners/gradle-plugin/build.gradle.kts
index 00e3602e..0222f5e0 100644
--- a/runners/gradle-plugin/build.gradle.kts
+++ b/runners/gradle-plugin/build.gradle.kts
@@ -47,15 +47,13 @@ gradlePlugin {
 
 publishing {
     publications {
-        maybeCreate<MavenPublication>("pluginMaven").apply {
+        register<MavenPublication>("pluginMaven") {
             artifactId = "dokka-gradle-plugin"
-            artifact(sourceJar.get())
         }
 
         register<MavenPublication>("dokkaGradlePluginForIntegrationTests") {
             artifactId = "dokka-gradle-plugin"
             from(components["java"])
-            artifact(sourceJar.get())
             version = "for-integration-tests-SNAPSHOT"
         }
     }
diff --git a/runners/maven-plugin/build.gradle.kts b/runners/maven-plugin/build.gradle.kts
index 83d9f5af..fbd2b48a 100644
--- a/runners/maven-plugin/build.gradle.kts
+++ b/runners/maven-plugin/build.gradle.kts
@@ -1,6 +1,6 @@
 import org.jetbrains.CrossPlatformExec
 import org.jetbrains.SetupMaven
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 val setupMaven by tasks.register<SetupMaven>("setupMaven")
 
@@ -45,7 +45,10 @@ val generatePom by tasks.registering(Copy::class) {
             line.replace("<version>dokka_version</version>", "<version>$dokka_version</version>")
         }
         filter { line ->
-            line.replace("<version>maven-plugin-plugin</version>", "<version>${setupMaven.mavenPluginToolsVersion}</version>")
+            line.replace(
+                "<version>maven-plugin-plugin</version>",
+                "<version>${setupMaven.mavenPluginToolsVersion}</version>"
+            )
         }
     }
 }
@@ -90,4 +93,6 @@ tasks.named<Jar>("jar") {
     }
 }
 
-configurePublication("dokka-maven-plugin")
+registerDokkaArtifactPublication("dokkaMavenPlugin") {
+    artifactId = "dokka-maven-plugin"
+}
diff --git a/testApi/build.gradle.kts b/testApi/build.gradle.kts
index 1576dd99..fc882f44 100644
--- a/testApi/build.gradle.kts
+++ b/testApi/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
     `maven-publish`
@@ -13,4 +13,6 @@ dependencies {
     implementation(kotlin("reflect"))
 }
 
-configurePublication("dokka-test-api")
+registerDokkaArtifactPublication("dokkaTestApi") {
+    artifactId = "dokka-test-api"
+}
-- 
cgit