From 45e56f9c147e933e30d071f31fc840b95ee0cc01 Mon Sep 17 00:00:00 2001
From: Bogdan Mukvich <bogdan.mukvich@jetbrains.com>
Date: Thu, 29 Jun 2023 15:16:53 +0200
Subject: [PATCH] Disable SBOM for Gradle plugins

Current implementation causes publishing to fail

^KTI-1282
---
 buildSrc/src/main/kotlin/GradleCommon.kt                  | 8 --------
 .../gradle-plugin-dependency-configuration.gradle.kts     | 2 +-
 .../examples/kotlin-gradle-subplugin-example/build.gradle | 2 +-
 .../tools/kotlin-gradle-plugins-bom/build.gradle.kts      | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/kotlin/GradleCommon.kt b/buildSrc/src/main/kotlin/GradleCommon.kt
index 2c5d55450b7..eb88afb541f 100644
--- a/buildSrc/src/main/kotlin/GradleCommon.kt
+++ b/buildSrc/src/main/kotlin/GradleCommon.kt
@@ -65,9 +65,7 @@ val commonSourceSetName = "common"
  */
 fun Project.configureCommonPublicationSettingsForGradle(
     signingRequired: Boolean,
-    sbom: Boolean = true,
 ) {
-    val sbomTask = if (sbom) configureSbom() else null
     plugins.withId("maven-publish") {
         configureDefaultPublishing(signingRequired)
 
@@ -76,12 +74,6 @@ fun Project.configureCommonPublicationSettingsForGradle(
                 .withType<MavenPublication>()
                 .configureEach {
                     configureKotlinPomAttributes(project)
-
-                    if (sbomTask != null) {
-                        artifact(sbomTask.map { it.outputDirectory.file("MainPublication.spdx.json") }) {
-                            extension = "spdx.json"
-                        }
-                    }
                 }
         }
     }
diff --git a/buildSrc/src/main/kotlin/gradle-plugin-dependency-configuration.gradle.kts b/buildSrc/src/main/kotlin/gradle-plugin-dependency-configuration.gradle.kts
index 7c0f54c5465..60c0df36314 100644
--- a/buildSrc/src/main/kotlin/gradle-plugin-dependency-configuration.gradle.kts
+++ b/buildSrc/src/main/kotlin/gradle-plugin-dependency-configuration.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     `maven-publish`
 }
 
-configureCommonPublicationSettingsForGradle(signLibraryPublication, sbom = false)
+configureCommonPublicationSettingsForGradle(signLibraryPublication)
 configureKotlinCompileTasksGradleCompatibility()
 addBomCheckTask()
 extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
index 5c575b8b392..057e41b1ef8 100644
--- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
+++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     compileOnly project(':dependencies:intellij-core')
 }
 
-GradleCommonKt.configureCommonPublicationSettingsForGradle(project, false, false)
+GradleCommonKt.configureCommonPublicationSettingsForGradle(project, false)
 GradleCommonKt.configureKotlinCompileTasksGradleCompatibility(project)
 GradleCommonKt.excludeGradleCommonDependencies(project, sourceSets.main)
 TasksKt.optInToExperimentalCompilerApi(project)
diff --git a/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts b/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts
index 0bce50d7d29..36f288f5d10 100644
--- a/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     }
 }
 
-configureCommonPublicationSettingsForGradle(signLibraryPublication, sbom = false)
+configureCommonPublicationSettingsForGradle(signLibraryPublication)
 
 publishing {
     publications {