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

Configure SBOM should return artifact

Browse Source
This commit is contained in:
Bogdan Mukvich
2023-05-22 13:48:08 +02:00
committed by Space Team
parent 1e4f78dcff
commit 02de693a12
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/sbom.kt
+4 -4
View File
@@ -1,5 +1,5 @@
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.PublishArtifact
import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import org.spdx.sbom.gradle.SpdxSbomExtension import org.spdx.sbom.gradle.SpdxSbomExtension
@@ -14,7 +14,7 @@ import java.util.*
fun Project.configureSbom( fun Project.configureSbom(
moduleName: String = this.name, moduleName: String = this.name,
gradleConfigurations: Iterable<String> = setOf("runtimeClasspath"), gradleConfigurations: Iterable<String> = setOf("runtimeClasspath"),
): Configuration { ): PublishArtifact {
val project = this val project = this
apply<SpdxSbomPlugin>() apply<SpdxSbomPlugin>()
@@ -44,12 +44,12 @@ fun Project.configureSbom(
isCanBeConsumed = true isCanBeConsumed = true
} }
val sbomFile = layout.buildDirectory.file("spdx/$moduleName.spdx.json") val sbomFile = layout.buildDirectory.file("spdx/$moduleName.spdx.json")
artifacts.add(sbomCfg.name, sbomFile.get().asFile) { val sbomArtifact = artifacts.add(sbomCfg.name, sbomFile.get().asFile) {
type = "sbom" type = "sbom"
extension = "spdx.json" extension = "spdx.json"
val capitalizedModuleName = val capitalizedModuleName =
moduleName.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } moduleName.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
builtBy("spdxSbomFor$capitalizedModuleName") builtBy("spdxSbomFor$capitalizedModuleName")
} }
return sbomCfg return sbomArtifact
} }
libraries/commonConfiguration.gradle
+2 -2
View File
@@ -56,8 +56,8 @@ ext.configurePublishing = { Project project, configure = { } ->
} }
} }
ext.configureSbom = { Project project, Iterable<String> gradleConfigurations = ["runtimeClasspath"] -> ext.configureSbom = { Project project, String moduleName = project.name, Iterable<String> gradleConfigurations = ["runtimeClasspath"] ->
SbomKt.configureSbom(project, gradleConfigurations) SbomKt.configureSbom(project, moduleName, gradleConfigurations)
} }
ext.configureFrontendIr = { Project project -> ext.configureFrontendIr = { Project project ->
prepare/compiler/build.gradle.kts
+3 -2
View File
@@ -431,7 +431,7 @@ val distJs = distTask<Sync>("distJs") {
} }
val compilerZipSbomName = "kotlin-compiler-zip" val compilerZipSbomName = "kotlin-compiler-zip"
val compilerZipSbom = configureSbom( val sbom = configureSbom(
moduleName = compilerZipSbomName, moduleName = compilerZipSbomName,
gradleConfigurations = setOf("runtimeClasspath", libraries.name, librariesStripVersion.name, compilerPlugins.name) gradleConfigurations = setOf("runtimeClasspath", libraries.name, librariesStripVersion.name, compilerPlugins.name)
) )
@@ -443,10 +443,11 @@ distTask<Copy>("dist") {
dependsOn(distCommon) dependsOn(distCommon)
dependsOn(distMaven) dependsOn(distMaven)
dependsOn(distJs) dependsOn(distJs)
dependsOn("spdxSbomForKotlin-compiler-zip")
from(buildNumber) from(buildNumber)
from(distStdlibMinimalForTests) from(distStdlibMinimalForTests)
from(compilerZipSbom.artifacts.files) { from(sbom.file) {
rename("$compilerZipSbomName.spdx.json", "${project.name}-${project.version}.spdx.json") rename("$compilerZipSbomName.spdx.json", "${project.name}-${project.version}.spdx.json")
} }
} }