From e730b82c4db6306a5b9e552d8a4c6578b0c1e01a Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Thu, 13 Feb 2020 12:52:39 +0100 Subject: Update packaging structure, fix testAPI publication, simplify dependencies handling in plugins Fixes #627 This commit removes repackaging `dokka-core` with all its dependencies by creating a publication for those dependencies. Moreover it moves `kotlinx-markdown` dependency to `coreDependencies` as this library is only present in Kotlin Bintray repository. TestAPI now publishes correctly --- core/build.gradle.kts | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'core') diff --git a/core/build.gradle.kts b/core/build.gradle.kts index e70791f3..c8cae2d6 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -7,30 +7,20 @@ plugins { } dependencies { - implementation(project(":coreDependencies", configuration = "shadow")) + api(project(":coreDependencies", configuration = "shadow")) val kotlin_version: String by project - implementation("org.jetbrains.kotlin:kotlin-compiler:$kotlin_version") - implementation("org.jetbrains.kotlin:kotlin-script-runtime:$kotlin_version") + api("org.jetbrains.kotlin:kotlin-compiler:$kotlin_version") + implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.10") implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version") implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version") implementation("org.jsoup:jsoup:1.12.1") implementation("com.google.code.gson:gson:2.8.5") - implementation("org.jetbrains:markdown:0.1.41") - implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.10") testImplementation(project(":testApi")) testImplementation("junit:junit:4.13") } -tasks { - shadowJar { - val dokka_version: String by project - archiveFileName.set("dokka-core-$dokka_version.jar") - archiveClassifier.set("") - } -} - val sourceJar by tasks.registering(Jar::class) { archiveClassifier.set("sources") from(sourceSets["main"].allSource) @@ -40,7 +30,7 @@ publishing { publications { register("dokkaCore") { artifactId = "dokka-core" - project.shadow.component(this) + from(components["java"]) artifact(sourceJar.get()) } } -- cgit