azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Use separate sbom directories per publication

Browse Source 
Currently, `SpdxSbomTask` declares output file not as `@OutputFile`, but `@OutputDirectory` leading to overlapping outputs problem. This way the problem is worked around.
#KTI-1221 In Progress
This commit is contained in:
Alexander.Likhachev
2023-06-07 16:35:32 +02:00
committed by Space Team
parent 407a2d4203
commit 786653baf2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/sbom.kt
+5 -2
View File
@@ -47,8 +47,11 @@ fun Project.configureSbom(
} }
} }
val spdxSbomTask = tasks.named<SpdxSbomTask>("spdxSbomFor$targetName") val sbomOutputDirectory = layout.buildDirectory.dir("spdx/$targetName")
val sbomFile = layout.buildDirectory.file("spdx/$targetName.spdx.json") val spdxSbomTask = tasks.named<SpdxSbomTask>("spdxSbomFor$targetName") {
outputDirectory.set(sbomOutputDirectory)
}
val sbomFile = sbomOutputDirectory.map { it.file("$targetName.spdx.json") }
val sbomCfg = configurations.maybeCreate("sbomFor$targetName").apply { val sbomCfg = configurations.maybeCreate("sbomFor$targetName").apply {
isCanBeResolved = false isCanBeResolved = false
isCanBeConsumed = true isCanBeConsumed = true