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

Build: Refactor sbom configuration & wire it with main publication

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2023-05-24 11:11:02 +02:00
committed by Space Team
parent 18f52832f5
commit e0a477f16d
9 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/commonConfiguration.gradle
+2 -2
View File
@@ -56,8 +56,8 @@ ext.configurePublishing = { Project project, configure = { } ->
}
}
ext.configureSbom = { Project project, String moduleName = project.name, Iterable<String> gradleConfigurations = ["runtimeClasspath"] ->
SbomKt.configureSbom(project, moduleName, gradleConfigurations)
ext.configureSbom = { Project project, String target = null, String documentTitle = null, Iterable<String> gradleConfigurations = ["runtimeClasspath"] ->
SbomKt.configureSbom(project, target, documentTitle, gradleConfigurations)
}
ext.configureFrontendIr = { Project project ->
libraries/stdlib/common/build.gradle
+2 -4
View File
@@ -2,10 +2,8 @@ description = 'Kotlin Common Standard Library'
apply plugin: 'kotlin-platform-common'
def sbom = configureSbom(project)
configurePublishing(project, {
artifact(sbom)
})
configureSbom(project)
configurePublishing(project)
JvmToolchain.updateJvmTarget(project, "1.8")
libraries/stdlib/jdk7/build.gradle
+2 -4
View File
@@ -4,10 +4,8 @@ apply plugin: 'kotlin'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
def sbom = configureSbom(project)
configurePublishing(project, {
artifact(sbom)
})
configureSbom(project)
configurePublishing(project)
configureSourcesJar()
configureJavadocJar()
libraries/stdlib/jdk8/build.gradle
+2 -4
View File
@@ -2,10 +2,8 @@ description = 'Kotlin Standard Library JDK 8 extension'
apply plugin: 'kotlin'
def sbom = configureSbom(project)
configurePublishing(project, {
artifact(sbom)
})
configureSbom(project)
configurePublishing(project)
configureSourcesJar()
configureJavadocJar()
libraries/stdlib/jvm/build.gradle
+2 -4
View File
@@ -6,10 +6,8 @@ archivesBaseName = 'kotlin-stdlib'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
def sbom = configureSbom(project)
configurePublishing(project, {
artifact(sbom)
})
configureSbom(project)
configurePublishing(project)
configureJavadocJar()
configureSourcesJar()