Disable SBOM for Gradle plugins
Current implementation causes publishing to fail ^KTI-1282
This commit is contained in:
committed by
Space Team
parent
a6e45f9b59
commit
45e56f9c14
@@ -65,9 +65,7 @@ val commonSourceSetName = "common"
|
|||||||
*/
|
*/
|
||||||
fun Project.configureCommonPublicationSettingsForGradle(
|
fun Project.configureCommonPublicationSettingsForGradle(
|
||||||
signingRequired: Boolean,
|
signingRequired: Boolean,
|
||||||
sbom: Boolean = true,
|
|
||||||
) {
|
) {
|
||||||
val sbomTask = if (sbom) configureSbom() else null
|
|
||||||
plugins.withId("maven-publish") {
|
plugins.withId("maven-publish") {
|
||||||
configureDefaultPublishing(signingRequired)
|
configureDefaultPublishing(signingRequired)
|
||||||
|
|
||||||
@@ -76,12 +74,6 @@ fun Project.configureCommonPublicationSettingsForGradle(
|
|||||||
.withType<MavenPublication>()
|
.withType<MavenPublication>()
|
||||||
.configureEach {
|
.configureEach {
|
||||||
configureKotlinPomAttributes(project)
|
configureKotlinPomAttributes(project)
|
||||||
|
|
||||||
if (sbomTask != null) {
|
|
||||||
artifact(sbomTask.map { it.outputDirectory.file("MainPublication.spdx.json") }) {
|
|
||||||
extension = "spdx.json"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ plugins {
|
|||||||
`maven-publish`
|
`maven-publish`
|
||||||
}
|
}
|
||||||
|
|
||||||
configureCommonPublicationSettingsForGradle(signLibraryPublication, sbom = false)
|
configureCommonPublicationSettingsForGradle(signLibraryPublication)
|
||||||
configureKotlinCompileTasksGradleCompatibility()
|
configureKotlinCompileTasksGradleCompatibility()
|
||||||
addBomCheckTask()
|
addBomCheckTask()
|
||||||
extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
|
extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ dependencies {
|
|||||||
compileOnly project(':dependencies:intellij-core')
|
compileOnly project(':dependencies:intellij-core')
|
||||||
}
|
}
|
||||||
|
|
||||||
GradleCommonKt.configureCommonPublicationSettingsForGradle(project, false, false)
|
GradleCommonKt.configureCommonPublicationSettingsForGradle(project, false)
|
||||||
GradleCommonKt.configureKotlinCompileTasksGradleCompatibility(project)
|
GradleCommonKt.configureKotlinCompileTasksGradleCompatibility(project)
|
||||||
GradleCommonKt.excludeGradleCommonDependencies(project, sourceSets.main)
|
GradleCommonKt.excludeGradleCommonDependencies(project, sourceSets.main)
|
||||||
TasksKt.optInToExperimentalCompilerApi(project)
|
TasksKt.optInToExperimentalCompilerApi(project)
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
configureCommonPublicationSettingsForGradle(signLibraryPublication, sbom = false)
|
configureCommonPublicationSettingsForGradle(signLibraryPublication)
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
|
|||||||
Reference in New Issue
Block a user