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