From 6bf199495c88be14621bbfbf6ce04588008f6282 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Tue, 10 Apr 2018 23:01:47 -0700
Subject: Fix: include original artifacts when signing

---
 project/plugins.sbt         |  1 -
 src/main/scala/SbtGpg.scala | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 373f530..1cc41de 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,2 @@
 addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.4.0")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
-addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.1.1")
diff --git a/src/main/scala/SbtGpg.scala b/src/main/scala/SbtGpg.scala
index a015677..17eff8d 100644
--- a/src/main/scala/SbtGpg.scala
+++ b/src/main/scala/SbtGpg.scala
@@ -37,17 +37,20 @@ object SbtGpg extends AutoPlugin {
       val log = streams.value.log
       val arts: Map[Artifact, File] = packagedArtifacts.value
       var failed = false
-      arts.map {
+      arts.flatMap {
         case (art, file) if !failed =>
           gpg.value.sign(file) match {
             case Some(signed) =>
-              art.withExtension(art.extension + ".asc") -> signed
+              Map(
+                art -> file,
+                art.withExtension(art.extension + ".asc") -> signed
+              )
             case None =>
               log.warn("GPG reported an error. Artifacts won't be signed.")
               failed = true
-              art -> file
+              Map(art -> file)
           }
-        case (art, file) => art -> file
+        case (art, file) => Map(art -> file)
       }
     }
   )
-- 
cgit v1.2.3