From 09cab6c226091032903ab0290757d6c11f8963a6 Mon Sep 17 00:00:00 2001 From: Vechro <6316604+Vechro@users.noreply.github.com> Date: Fri, 5 May 2023 21:18:58 +0100 Subject: [PATCH] Fix publishing dependency version mapping (#309) --- .../kotlin-multiplatform.gradle.kts | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts index dae7a2b1..66ff570b 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts @@ -104,17 +104,33 @@ if (shouldPublish) { val fjdj = tasks.create("fakeJavaDocJar", Jar::class) { archiveClassifier.set("javadoc") } - matching { it.name == "jvm" }.forEach { p -> - p as MavenPublication - p.artifact(fjdj) - } - all { + named("js") { this as MavenPublication versionMapping { allVariants { - fromResolutionOf("commonMainApiDependenciesMetadata") + fromResolutionOf("jsMainResolvableDependenciesMetadata") } } + } + named("jvm") { + this as MavenPublication + this.artifact(fjdj) + versionMapping { + allVariants { + fromResolutionOf("jvmMainResolvableDependenciesMetadata") + } + } + } + named("kotlinMultiplatform") { + this as MavenPublication + versionMapping { + allVariants { + fromResolutionOf("commonMainResolvableDependenciesMetadata") + } + } + } + all { + this as MavenPublication pom { name.set(project.name) description.set(project.name)