From 18f52832f526d9d5dc5798ebe27f5b6778463678 Mon Sep 17 00:00:00 2001 From: Bogdan Mukvich Date: Mon, 22 May 2023 13:48:51 +0200 Subject: [PATCH] Configure SBOM maven publishing for stdlib --- libraries/stdlib/common/build.gradle | 5 ++++- libraries/stdlib/jdk7/build.gradle | 5 ++++- libraries/stdlib/jdk8/build.gradle | 5 ++++- libraries/stdlib/jvm/build.gradle | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle index c395d6c7609..8ca2c66891b 100644 --- a/libraries/stdlib/common/build.gradle +++ b/libraries/stdlib/common/build.gradle @@ -2,7 +2,10 @@ description = 'Kotlin Common Standard Library' apply plugin: 'kotlin-platform-common' -configurePublishing(project) +def sbom = configureSbom(project) +configurePublishing(project, { + artifact(sbom) +}) JvmToolchain.updateJvmTarget(project, "1.8") diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 6f3a1dfa2a6..f2d2624b3e4 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -4,7 +4,10 @@ apply plugin: 'kotlin' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) -configurePublishing(project) +def sbom = configureSbom(project) +configurePublishing(project, { + artifact(sbom) +}) configureSourcesJar() configureJavadocJar() diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index 0c5f1ae7118..ea1b5b62c11 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -2,7 +2,10 @@ description = 'Kotlin Standard Library JDK 8 extension' apply plugin: 'kotlin' -configurePublishing(project) +def sbom = configureSbom(project) +configurePublishing(project, { + artifact(sbom) +}) configureSourcesJar() configureJavadocJar() diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index eaac7109535..e0a98a29e6b 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -6,7 +6,10 @@ archivesBaseName = 'kotlin-stdlib' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) -configurePublishing(project) +def sbom = configureSbom(project) +configurePublishing(project, { + artifact(sbom) +}) configureJavadocJar() configureSourcesJar()