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

Update SPDX gradle plugin

Browse Source 
* fixes SPDX Gradle plugin to be used with configuration cache
* allows removing output workaround for multimodule builds

KTI-1427
This commit is contained in:
Bogdan Mukvich
2024-03-08 18:28:45 +01:00
committed by Space Team
parent 633e96b966
commit c6aac835e5
6 changed files with 113 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build.gradle
+4 -4
View File
@@ -492,7 +492,7 @@ def sbomBundleRegular = SbomKt.configureSbom(project, "BundleRegular", "Kotlin/N
def sbomBundleRegularForPublish = tasks.register("sbomBundleRegularForPublish", Copy) {
dependsOn(sbomBundleRegular)
destinationDir = file("$buildDir/spdx/regular")
from(sbomBundleRegular.map { it.outputDirectory.file("BundleRegular.spdx.json") }) {
from(sbomBundleRegular) {
rename(".*", "kotlin-native-${HostManager.platformName()}-${kotlinVersion}.spdx.json")
}
}
@@ -520,7 +520,7 @@ def sbomBundlePrebuilt = SbomKt.configureSbom(project,
def sbomBundlePrebuiltForPublish = tasks.register("sbomBundlePrebuiltForPublish", Copy) {
dependsOn(sbomBundlePrebuilt)
destinationDir = file("$buildDir/spdx/prebuilt")
from(sbomBundlePrebuilt.map { it.outputDirectory.file("BundlePrebuilt.spdx.json") }) {
from(sbomBundlePrebuilt) {
rename(".*", "kotlin-native-prebuilt-${HostManager.platformName()}-${kotlinVersion}.spdx.json")
}
}
@@ -806,7 +806,7 @@ publishing {
classifier = HostManager.platformName()
extension = (PlatformInfo.isWindows()) ? 'zip' : 'tar.gz'
}
mvn.artifact(sbomBundleRegular.map { it.outputDirectory.file("BundleRegular.spdx.json") }) {
mvn.artifact(sbomBundleRegular) {
classifier = HostManager.platformName()
extension = "spdx.json"
}
@@ -847,7 +847,7 @@ publishing {
classifier = HostManager.platformName()
extension = (PlatformInfo.isWindows()) ? 'zip' : 'tar.gz'
}
mvn.artifact(sbomBundlePrebuilt.map { it.outputDirectory.file("BundlePrebuilt.spdx.json") }) {
mvn.artifact(sbomBundlePrebuilt) {
classifier = HostManager.platformName()
extension = "spdx.json"
}