From ec73815f80d08e56238102e39c7a4d868c9e52ad Mon Sep 17 00:00:00 2001 From: Bogdan Mukvich Date: Fri, 4 Aug 2023 13:14:35 +0200 Subject: [PATCH] Generate SBOM for kotlin gradle plugin and its API ^KTI-1129 --- .../buildsrc-compat/src/main/kotlin/GradleCommon.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt index 37416913c81..1d5f4a4a99b 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/GradleCommon.kt @@ -78,7 +78,7 @@ fun Project.configureCommonPublicationSettingsForGradle( .withType() .configureEach { configureKotlinPomAttributes(project) - if (sbom && project.name !in testPlugins) { + if (sbom && project.name !in internalPlugins) { if (name == "pluginMaven") { val sbomTask = configureSbom(target = "PluginMaven") artifact("$buildDir/spdx/PluginMaven/PluginMaven.spdx.json") { @@ -124,11 +124,14 @@ fun Project.excludeGradleCommonDependencies(sourceSet: SourceSet) { configurations[sourceSet.runtimeOnlyConfigurationName].excludeGradleCommonDependencies() } -private val testPlugins = setOf( - "kotlin-gradle-plugin-api", +private val internalPlugins = setOf( "android-test-fixes", "gradle-warnings-detector", "kotlin-compiler-args-properties", +) + +private val testPlugins = internalPlugins + setOf( + "kotlin-gradle-plugin-api", "kotlin-gradle-plugin", )