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 --- .../api/jekyll-template-processing.api | 6 --- .../jekyll-template-processing/build.gradle.kts | 31 --------------- .../JekyllTemplateProcessingPlugin.kt | 44 ---------------------- .../org.jetbrains.dokka.plugability.DokkaPlugin | 5 --- 4 files changed, 86 deletions(-) delete mode 100644 plugins/jekyll/jekyll-template-processing/api/jekyll-template-processing.api delete mode 100644 plugins/jekyll/jekyll-template-processing/build.gradle.kts delete mode 100644 plugins/jekyll/jekyll-template-processing/src/main/kotlin/org/jetbrains/dokka/gfm/templateProcessing/JekyllTemplateProcessingPlugin.kt delete mode 100644 plugins/jekyll/jekyll-template-processing/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin (limited to 'plugins/jekyll/jekyll-template-processing') diff --git a/plugins/jekyll/jekyll-template-processing/api/jekyll-template-processing.api b/plugins/jekyll/jekyll-template-processing/api/jekyll-template-processing.api deleted file mode 100644 index 482a0d40..00000000 --- a/plugins/jekyll/jekyll-template-processing/api/jekyll-template-processing.api +++ /dev/null @@ -1,6 +0,0 @@ -public final class org/jetbrains/dokka/gfm/templateProcessing/JekyllTemplateProcessingPlugin : org/jetbrains/dokka/plugability/DokkaPlugin { - public fun ()V - public final fun getJekyllLocationProvider ()Lorg/jetbrains/dokka/plugability/Extension; - public final fun getJekyllPartialLocationProvider ()Lorg/jetbrains/dokka/plugability/Extension; -} - diff --git a/plugins/jekyll/jekyll-template-processing/build.gradle.kts b/plugins/jekyll/jekyll-template-processing/build.gradle.kts deleted file mode 100644 index 55f59754..00000000 --- a/plugins/jekyll/jekyll-template-processing/build.gradle.kts +++ /dev/null @@ -1,31 +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.registerDokkaArtifactPublication - -plugins { - id("org.jetbrains.conventions.kotlin-jvm") - id("org.jetbrains.conventions.maven-publish") -} - -dependencies { - compileOnly(projects.core) - - implementation(projects.plugins.base) - implementation(projects.plugins.jekyll) - implementation(projects.plugins.allModulesPage) - implementation(projects.plugins.templating) - implementation(projects.plugins.gfm) - implementation(projects.plugins.gfm.gfmTemplateProcessing) - - implementation(kotlin("reflect")) - implementation(libs.kotlinx.coroutines.core) - - testImplementation(kotlin("test")) - testImplementation(projects.core.testApi) -} - -registerDokkaArtifactPublication("dokkaJekyllTemplateProcessing") { - artifactId = "jekyll-template-processing-plugin" -} diff --git a/plugins/jekyll/jekyll-template-processing/src/main/kotlin/org/jetbrains/dokka/gfm/templateProcessing/JekyllTemplateProcessingPlugin.kt b/plugins/jekyll/jekyll-template-processing/src/main/kotlin/org/jetbrains/dokka/gfm/templateProcessing/JekyllTemplateProcessingPlugin.kt deleted file mode 100644 index c5bcd67b..00000000 --- a/plugins/jekyll/jekyll-template-processing/src/main/kotlin/org/jetbrains/dokka/gfm/templateProcessing/JekyllTemplateProcessingPlugin.kt +++ /dev/null @@ -1,44 +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.gfm.templateProcessing - -import org.jetbrains.dokka.allModulesPage.AllModulesPagePlugin -import org.jetbrains.dokka.allModulesPage.MultimoduleLocationProvider -import org.jetbrains.dokka.base.DokkaBase -import org.jetbrains.dokka.base.resolvers.local.DokkaLocationProviderFactory -import org.jetbrains.dokka.base.resolvers.local.LocationProviderFactory -import org.jetbrains.dokka.jekyll.JekyllPlugin -import org.jetbrains.dokka.plugability.DokkaPlugin -import org.jetbrains.dokka.plugability.DokkaPluginApiPreview -import org.jetbrains.dokka.plugability.Extension -import org.jetbrains.dokka.plugability.PluginApiPreviewAcknowledgement - -public class JekyllTemplateProcessingPlugin : DokkaPlugin() { - - private val allModulesPagePlugin by lazy { plugin() } - - private val jekyllPlugin by lazy { plugin() } - private val gfmTemplatingPlugin by lazy { plugin() } - - private val dokkaBase by lazy { plugin() } - - public val jekyllLocationProvider: Extension by extending { - dokkaBase.locationProviderFactory providing MultimoduleLocationProvider::Factory override listOf( - jekyllPlugin.locationProvider, - gfmTemplatingPlugin.gfmLocationProvider - ) - } - - public val jekyllPartialLocationProvider: Extension by extending { - allModulesPagePlugin.partialLocationProviderFactory providing ::DokkaLocationProviderFactory override listOf( - allModulesPagePlugin.baseLocationProviderFactory, - gfmTemplatingPlugin.gfmPartialLocationProvider - ) - } - - @OptIn(DokkaPluginApiPreview::class) - override fun pluginApiPreviewAcknowledgement(): PluginApiPreviewAcknowledgement = - PluginApiPreviewAcknowledgement -} diff --git a/plugins/jekyll/jekyll-template-processing/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin b/plugins/jekyll/jekyll-template-processing/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin deleted file mode 100644 index d9584167..00000000 --- a/plugins/jekyll/jekyll-template-processing/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin +++ /dev/null @@ -1,5 +0,0 @@ -# -# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. -# - -org.jetbrains.dokka.gfm.templateProcessing.JekyllTemplateProcessingPlugin -- cgit