Skip to content

Commit 45e56f9

Browse files
BadyaSpace Team
authored and
Space Team
committed
Disable SBOM for Gradle plugins
Current implementation causes publishing to fail ^KTI-1282
1 parent a6e45f9 commit 45e56f9

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

buildSrc/src/main/kotlin/GradleCommon.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ val commonSourceSetName = "common"
6565
*/
6666
fun Project.configureCommonPublicationSettingsForGradle(
6767
signingRequired: Boolean,
68-
sbom: Boolean = true,
6968
) {
70-
val sbomTask = if (sbom) configureSbom() else null
7169
plugins.withId("maven-publish") {
7270
configureDefaultPublishing(signingRequired)
7371

@@ -76,12 +74,6 @@ fun Project.configureCommonPublicationSettingsForGradle(
7674
.withType<MavenPublication>()
7775
.configureEach {
7876
configureKotlinPomAttributes(project)
79-
80-
if (sbomTask != null) {
81-
artifact(sbomTask.map { it.outputDirectory.file("MainPublication.spdx.json") }) {
82-
extension = "spdx.json"
83-
}
84-
}
8577
}
8678
}
8779
}

buildSrc/src/main/kotlin/gradle-plugin-dependency-configuration.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
`maven-publish`
1313
}
1414

15-
configureCommonPublicationSettingsForGradle(signLibraryPublication, sbom = false)
15+
configureCommonPublicationSettingsForGradle(signLibraryPublication)
1616
configureKotlinCompileTasksGradleCompatibility()
1717
addBomCheckTask()
1818
extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"

libraries/examples/kotlin-gradle-subplugin-example/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
compileOnly project(':dependencies:intellij-core')
3636
}
3737

38-
GradleCommonKt.configureCommonPublicationSettingsForGradle(project, false, false)
38+
GradleCommonKt.configureCommonPublicationSettingsForGradle(project, false)
3939
GradleCommonKt.configureKotlinCompileTasksGradleCompatibility(project)
4040
GradleCommonKt.excludeGradleCommonDependencies(project, sourceSets.main)
4141
TasksKt.optInToExperimentalCompilerApi(project)

libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
}
2727
}
2828

29-
configureCommonPublicationSettingsForGradle(signLibraryPublication, sbom = false)
29+
configureCommonPublicationSettingsForGradle(signLibraryPublication)
3030

3131
publishing {
3232
publications {

0 commit comments

Comments
 (0)