Merge pull request #57 from raboof/publish-bom

Publish sbom along with other artifacts
sbt · Oct 18, 2024 · da10d7d · da10d7d
2 parents 28bdfe0 + 66c0d8c
commit da10d7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -10,6 +10,8 @@ docstrings.style = Asterisk
 # This also seems more idiomatic to include whitespace in import x.{ yyy }
 spaces.inImportCurlyBraces = true
 
+rewrite.trailingCommas.style = keep
+
 align.tokens."+" = [
   {
     code   = "%"

diff --git a/src/main/scala/io/github/siculo/sbtbom/BomSbtPlugin.scala b/src/main/scala/io/github/siculo/sbtbom/BomSbtPlugin.scala
@@ -2,8 +2,9 @@ package io.github.siculo.sbtbom
 
 import io.github.siculo.sbtbom.PluginConstants._
 import org.cyclonedx.model.Component
-import sbt.Keys.{ artifact, configuration, version }
+import sbt.Keys.{ artifact, configuration, packagedArtifacts, version }
 import sbt.{ Def, _ }
+import sbt.plugins.JvmPlugin
 
 import scala.language.postfixOps
 
@@ -12,7 +13,7 @@ import scala.language.postfixOps
  */
 object BomSbtPlugin extends AutoPlugin {
 
-  override def requires: Plugins = empty
+  override def requires: Plugins = JvmPlugin
 
   override def trigger: PluginTrigger = allRequirements
 
@@ -51,7 +52,10 @@ object BomSbtPlugin extends AutoPlugin {
       IntegrationTest / listBom := Def
         .taskDyn(BomSbtSettings.listBomTask(Classpaths.updateTask.value, IntegrationTest))
         .value,
-      bomConfigurations := Def.taskDyn(BomSbtSettings.bomConfigurationTask((configuration ?).value)).value
+      bomConfigurations := Def.taskDyn(BomSbtSettings.bomConfigurationTask((configuration ?).value)).value,
+      packagedArtifacts += {
+        Artifact(artifact.value.name, "cyclonedx", "xml", "cyclonedx") -> makeBom.value
+      },
     )
   }
 }