From e9b9a3e8858f1b5e41a411e6e4995d796f3e409f Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@inpher.io>
Date: Thu, 28 Feb 2019 01:20:00 +0100
Subject: Move to sbt-gpg for signing releases

---
 .ci/build           | 29 ++++++++++++++---------------
 project/plugins.sbt |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.ci/build b/.ci/build
index 351f08b..f8aeb1b 100755
--- a/.ci/build
+++ b/.ci/build
@@ -21,20 +21,19 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then
 	    -d
     gpg --import sec.gpg
 
-    # Setup sbt-pgp plugin
-    cat <<-EOF > gpg.sbt
-	pgpSigningKey in Global := Some(0x7C921C6769797655l)
-	useGpgAgent in Global := true
-	useGpg in Global := true
-	EOF
-
     # Setup publishing
     cat <<-EOF > sonatype.sbt
 	credentials in Global += Credentials(
-	    "Sonatype Nexus Repository Manager",
-	    "oss.sonatype.org",
-	    "8VNUX6+2",
-	    "$SONATYPE_PASS"
+	  "GnuPG Key ID",
+	  "gpg",
+	  "2B50AAFF11989ECC8531EB4A7C921C6769797655",
+	  "ignored"
+	)
+	credentials in Global += Credentials(
+	  "Sonatype Nexus Repository Manager",
+	  "oss.sonatype.org",
+	  "8VNUX6+2",
+	  "$SONATYPE_PASS"
 	)
 	EOF
     
@@ -46,9 +45,9 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then
     # not cross-compile and sbt complains if a published file is
     # overwritten
     sbt -Drelease=true \
-	native/publishSigned \
-	+sync/publishSigned \
-	+core/publishSigned \
-	+stream/publishSigned \
+	native/publish \
+	+sync/publish \
+	+core/publish \
+	+stream/publish \
 	sonatypeRelease
 fi
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 5990b6e..581816f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -15,7 +15,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
 
 // Sign published artifacts
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0")
 
 // Publish to sonatype and sync with maven central
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.4")
-- 
cgit v1.2.3