Disable SBOM for Gradle plugins

Current implementation causes publishing to fail

^KTI-1282
This commit is contained in:
Bogdan Mukvich
2023-06-29 15:16:53 +02:00
committed by Space Team
parent a6e45f9b59
commit 45e56f9c14
4 changed files with 3 additions and 11 deletions
-8
View File
@@ -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"
}
}
}
}
}
@@ -12,7 +12,7 @@ plugins {
`maven-publish`
}
configureCommonPublicationSettingsForGradle(signLibraryPublication, sbom = false)
configureCommonPublicationSettingsForGradle(signLibraryPublication)
configureKotlinCompileTasksGradleCompatibility()
addBomCheckTask()
extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
@@ -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)
@@ -26,7 +26,7 @@ dependencies {
}
}
configureCommonPublicationSettingsForGradle(signLibraryPublication, sbom = false)
configureCommonPublicationSettingsForGradle(signLibraryPublication)
publishing {
publications {