From 5caa5c5ab2b0f0c0fe72467506c0b2c5bfddb76b Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Wed, 15 Jun 2022 09:35:21 +0200 Subject: [PATCH] [kpm] kgp-idea: Skip unpublishable variants for testFixtures publication ^KT-52568 Verification Pending --- .../build.gradle.kts | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-idea/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-idea/build.gradle.kts index 03a3c9484a9..8f2448557a8 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-idea/build.gradle.kts @@ -32,11 +32,27 @@ dependencies { testFixturesImplementation(project(":kotlin-test:kotlin-test-junit")) } + publish(moduleMetadata = true) { - val kotlinLibraryComponent = components[ADHOC_COMPONENT_NAME] as AdhocComponentWithVariants - kotlinLibraryComponent.addVariantsFromConfiguration(configurations.testFixturesApiElements.get()) { mapToMavenScope("compile") } - kotlinLibraryComponent.addVariantsFromConfiguration(configurations.testFixturesRuntimeElements.get()) { mapToMavenScope("runtime") } + fun ConfigurationVariantDetails.skipUnpublishable() { + if (configurationVariant.artifacts.any { JavaBasePlugin.UNPUBLISHABLE_VARIANT_ARTIFACTS.contains(it.type) }) { + skip() + } + } + suppressAllPomMetadataWarnings() + + val kotlinLibraryComponent = components[ADHOC_COMPONENT_NAME] as AdhocComponentWithVariants + + kotlinLibraryComponent.addVariantsFromConfiguration(configurations.testFixturesApiElements.get()) { + mapToMavenScope("compile") + skipUnpublishable() + } + + kotlinLibraryComponent.addVariantsFromConfiguration(configurations.testFixturesRuntimeElements.get()) { + mapToMavenScope("runtime") + skipUnpublishable() + } } javadocJar()