aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2018-04-10 23:01:47 -0700
committerJakob Odersky <jakob@odersky.com>2018-04-10 23:02:44 -0700
commit6bf199495c88be14621bbfbf6ce04588008f6282 (patch)
treeaa9370ca2c59c18d0619afdfa8534fc26459c896
parentf1eff18904240b619e76d16da8d09351affd6498 (diff)
downloadsbt-gpg-6bf199495c88be14621bbfbf6ce04588008f6282.tar.gz
sbt-gpg-6bf199495c88be14621bbfbf6ce04588008f6282.tar.bz2
sbt-gpg-6bf199495c88be14621bbfbf6ce04588008f6282.zip
Fix: include original artifacts when signingv0.1.2
-rw-r--r--project/plugins.sbt1
-rw-r--r--src/main/scala/SbtGpg.scala11
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)
}
}
)