From 0b7fb9493328311b7e5eabfbaf73b20343056475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Tue, 17 Mar 2026 20:46:45 +0100 Subject: [PATCH] refactor(aggregator): Migrate to the Kotlin Multiplatform plugin, with a single JVM target This allows us to use our existing Gradle conventions more easily. --- aggregator/build.gradle.kts | 34 +++++++------------ .../kotlin/DokkaMkDocsAggregationPlugin.kt | 0 .../kotlin/DokkaMkDocsTemplatingStrategy.kt | 0 .../MarkdownMultimoduleLocationProvider.kt | 0 ...rg.jetbrains.dokka.plugability.DokkaPlugin | 0 5 files changed, 12 insertions(+), 22 deletions(-) rename aggregator/src/{main => jvmMain}/kotlin/DokkaMkDocsAggregationPlugin.kt (100%) rename aggregator/src/{main => jvmMain}/kotlin/DokkaMkDocsTemplatingStrategy.kt (100%) rename aggregator/src/{main => jvmMain}/kotlin/MarkdownMultimoduleLocationProvider.kt (100%) rename aggregator/src/{main => jvmMain}/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin (100%) diff --git a/aggregator/build.gradle.kts b/aggregator/build.gradle.kts index 5658211..585e623 100644 --- a/aggregator/build.gradle.kts +++ b/aggregator/build.gradle.kts @@ -1,33 +1,23 @@ plugins { alias(opensavvyConventions.plugins.base) - kotlin("jvm") - id("maven-publish") - alias(opensavvyConventions.plugins.kotlin.abstractLibrary) -} - -java { - withSourcesJar() + alias(opensavvyConventions.plugins.kotlin.library) } kotlin { - jvmToolchain(8) -} + jvm() -dependencies { - implementation(libs.kotlinx.coroutines) - implementation(libs.dokka.base) - implementation(libs.dokka.core) - implementation(libs.dokka.templating) - implementation(libs.dokka.allModulesPage) - implementation(projects.renderer) + sourceSets.jvmMain.dependencies { + implementation(libs.kotlinx.coroutines) + implementation(libs.dokka.base) + implementation(libs.dokka.core) + implementation(libs.dokka.templating) + implementation(libs.dokka.allModulesPage) + implementation(projects.renderer) + } } -publishing { - publications { - register("aggregator") { - from(components["java"]) - } - } +tapmoc { + java(8) } library { diff --git a/aggregator/src/main/kotlin/DokkaMkDocsAggregationPlugin.kt b/aggregator/src/jvmMain/kotlin/DokkaMkDocsAggregationPlugin.kt similarity index 100% rename from aggregator/src/main/kotlin/DokkaMkDocsAggregationPlugin.kt rename to aggregator/src/jvmMain/kotlin/DokkaMkDocsAggregationPlugin.kt diff --git a/aggregator/src/main/kotlin/DokkaMkDocsTemplatingStrategy.kt b/aggregator/src/jvmMain/kotlin/DokkaMkDocsTemplatingStrategy.kt similarity index 100% rename from aggregator/src/main/kotlin/DokkaMkDocsTemplatingStrategy.kt rename to aggregator/src/jvmMain/kotlin/DokkaMkDocsTemplatingStrategy.kt diff --git a/aggregator/src/main/kotlin/MarkdownMultimoduleLocationProvider.kt b/aggregator/src/jvmMain/kotlin/MarkdownMultimoduleLocationProvider.kt similarity index 100% rename from aggregator/src/main/kotlin/MarkdownMultimoduleLocationProvider.kt rename to aggregator/src/jvmMain/kotlin/MarkdownMultimoduleLocationProvider.kt diff --git a/aggregator/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin b/aggregator/src/jvmMain/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin similarity index 100% rename from aggregator/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin rename to aggregator/src/jvmMain/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin -- 2.51.2