From b3fb28c6e4a0457be5bf52282238c51572667ad9 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:19 +0100 Subject: [PATCH] refactor(renderer): Migrate to the Kotlin Multiplatform plugin, with a single JVM target This allows us to use our existing Gradle conventions more easily. --- renderer/build.gradle.kts | 33 +++++++------------ .../kotlin/MaterialForMkDocsPlugin.kt | 0 .../{main => jvmMain}/kotlin/gfmTemplating.kt | 0 .../location/MarkdownLocationProvider.kt | 0 .../renderer/BriefCommentPreprocessor.kt | 0 .../kotlin/renderer/Decoration.kt | 0 .../renderer/SignatureBreaklineTransformer.kt | 0 .../kotlin/renderer3/Content.kt | 0 .../kotlin/renderer3/Decorator.kt | 0 .../kotlin/renderer3/Groups.kt | 0 .../kotlin/renderer3/Header.kt | 0 .../kotlin/renderer3/Links.kt | 0 .../kotlin/renderer3/Lists.kt | 0 .../kotlin/renderer3/MkDocsRenderer3.kt | 0 .../renderer3/MultilineSignatureStyle.kt | 0 .../kotlin/renderer3/Page.kt | 0 .../kotlin/renderer3/PlatformSpecific.kt | 0 .../kotlin/renderer3/RenderingContext.kt | 0 .../kotlin/renderer3/Tables.kt | 0 .../kotlin/renderer3/Text.kt | 0 ...rg.jetbrains.dokka.plugability.DokkaPlugin | 0 21 files changed, 12 insertions(+), 21 deletions(-) rename renderer/src/{main => jvmMain}/kotlin/MaterialForMkDocsPlugin.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/gfmTemplating.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/location/MarkdownLocationProvider.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer/BriefCommentPreprocessor.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer/Decoration.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer/SignatureBreaklineTransformer.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/Content.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/Decorator.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/Groups.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/Header.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/Links.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/Lists.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/MkDocsRenderer3.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/MultilineSignatureStyle.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/Page.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/PlatformSpecific.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/RenderingContext.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/Tables.kt (100%) rename renderer/src/{main => jvmMain}/kotlin/renderer3/Text.kt (100%) rename renderer/src/{main => jvmMain}/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin (100%) diff --git a/renderer/build.gradle.kts b/renderer/build.gradle.kts index 8a6c01f..fd95282 100644 --- a/renderer/build.gradle.kts +++ b/renderer/build.gradle.kts @@ -1,32 +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() + + sourceSets.jvmMain.dependencies { + implementation(libs.kotlinx.coroutines) + compileOnly(libs.dokka.base) + compileOnly(libs.dokka.core) + compileOnly(libs.dokka.templating) + compileOnly(libs.dokka.allModulesPage) + } -dependencies { - implementation(libs.kotlinx.coroutines) - compileOnly(libs.dokka.base) - compileOnly(libs.dokka.core) - compileOnly(libs.dokka.templating) - compileOnly(libs.dokka.allModulesPage) } -publishing { - publications { - register("renderer") { - from(components["java"]) - } - } +tapmoc { + java(8) } library { diff --git a/renderer/src/main/kotlin/MaterialForMkDocsPlugin.kt b/renderer/src/jvmMain/kotlin/MaterialForMkDocsPlugin.kt similarity index 100% rename from renderer/src/main/kotlin/MaterialForMkDocsPlugin.kt rename to renderer/src/jvmMain/kotlin/MaterialForMkDocsPlugin.kt diff --git a/renderer/src/main/kotlin/gfmTemplating.kt b/renderer/src/jvmMain/kotlin/gfmTemplating.kt similarity index 100% rename from renderer/src/main/kotlin/gfmTemplating.kt rename to renderer/src/jvmMain/kotlin/gfmTemplating.kt diff --git a/renderer/src/main/kotlin/location/MarkdownLocationProvider.kt b/renderer/src/jvmMain/kotlin/location/MarkdownLocationProvider.kt similarity index 100% rename from renderer/src/main/kotlin/location/MarkdownLocationProvider.kt rename to renderer/src/jvmMain/kotlin/location/MarkdownLocationProvider.kt diff --git a/renderer/src/main/kotlin/renderer/BriefCommentPreprocessor.kt b/renderer/src/jvmMain/kotlin/renderer/BriefCommentPreprocessor.kt similarity index 100% rename from renderer/src/main/kotlin/renderer/BriefCommentPreprocessor.kt rename to renderer/src/jvmMain/kotlin/renderer/BriefCommentPreprocessor.kt diff --git a/renderer/src/main/kotlin/renderer/Decoration.kt b/renderer/src/jvmMain/kotlin/renderer/Decoration.kt similarity index 100% rename from renderer/src/main/kotlin/renderer/Decoration.kt rename to renderer/src/jvmMain/kotlin/renderer/Decoration.kt diff --git a/renderer/src/main/kotlin/renderer/SignatureBreaklineTransformer.kt b/renderer/src/jvmMain/kotlin/renderer/SignatureBreaklineTransformer.kt similarity index 100% rename from renderer/src/main/kotlin/renderer/SignatureBreaklineTransformer.kt rename to renderer/src/jvmMain/kotlin/renderer/SignatureBreaklineTransformer.kt diff --git a/renderer/src/main/kotlin/renderer3/Content.kt b/renderer/src/jvmMain/kotlin/renderer3/Content.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/Content.kt rename to renderer/src/jvmMain/kotlin/renderer3/Content.kt diff --git a/renderer/src/main/kotlin/renderer3/Decorator.kt b/renderer/src/jvmMain/kotlin/renderer3/Decorator.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/Decorator.kt rename to renderer/src/jvmMain/kotlin/renderer3/Decorator.kt diff --git a/renderer/src/main/kotlin/renderer3/Groups.kt b/renderer/src/jvmMain/kotlin/renderer3/Groups.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/Groups.kt rename to renderer/src/jvmMain/kotlin/renderer3/Groups.kt diff --git a/renderer/src/main/kotlin/renderer3/Header.kt b/renderer/src/jvmMain/kotlin/renderer3/Header.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/Header.kt rename to renderer/src/jvmMain/kotlin/renderer3/Header.kt diff --git a/renderer/src/main/kotlin/renderer3/Links.kt b/renderer/src/jvmMain/kotlin/renderer3/Links.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/Links.kt rename to renderer/src/jvmMain/kotlin/renderer3/Links.kt diff --git a/renderer/src/main/kotlin/renderer3/Lists.kt b/renderer/src/jvmMain/kotlin/renderer3/Lists.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/Lists.kt rename to renderer/src/jvmMain/kotlin/renderer3/Lists.kt diff --git a/renderer/src/main/kotlin/renderer3/MkDocsRenderer3.kt b/renderer/src/jvmMain/kotlin/renderer3/MkDocsRenderer3.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/MkDocsRenderer3.kt rename to renderer/src/jvmMain/kotlin/renderer3/MkDocsRenderer3.kt diff --git a/renderer/src/main/kotlin/renderer3/MultilineSignatureStyle.kt b/renderer/src/jvmMain/kotlin/renderer3/MultilineSignatureStyle.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/MultilineSignatureStyle.kt rename to renderer/src/jvmMain/kotlin/renderer3/MultilineSignatureStyle.kt diff --git a/renderer/src/main/kotlin/renderer3/Page.kt b/renderer/src/jvmMain/kotlin/renderer3/Page.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/Page.kt rename to renderer/src/jvmMain/kotlin/renderer3/Page.kt diff --git a/renderer/src/main/kotlin/renderer3/PlatformSpecific.kt b/renderer/src/jvmMain/kotlin/renderer3/PlatformSpecific.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/PlatformSpecific.kt rename to renderer/src/jvmMain/kotlin/renderer3/PlatformSpecific.kt diff --git a/renderer/src/main/kotlin/renderer3/RenderingContext.kt b/renderer/src/jvmMain/kotlin/renderer3/RenderingContext.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/RenderingContext.kt rename to renderer/src/jvmMain/kotlin/renderer3/RenderingContext.kt diff --git a/renderer/src/main/kotlin/renderer3/Tables.kt b/renderer/src/jvmMain/kotlin/renderer3/Tables.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/Tables.kt rename to renderer/src/jvmMain/kotlin/renderer3/Tables.kt diff --git a/renderer/src/main/kotlin/renderer3/Text.kt b/renderer/src/jvmMain/kotlin/renderer3/Text.kt similarity index 100% rename from renderer/src/main/kotlin/renderer3/Text.kt rename to renderer/src/jvmMain/kotlin/renderer3/Text.kt diff --git a/renderer/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin b/renderer/src/jvmMain/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin similarity index 100% rename from renderer/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin rename to renderer/src/jvmMain/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin -- 2.51.2