From f8f9093bcdc00c1219de7a965d5ec8aa737e6929 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Tue, 11 Sep 2018 17:58:41 -0700
Subject: Upgrade sbt and use sbt-gpg to sign artifacts

---
 .ci/build                | 14 +++++++++-----
 CHANGELOG.md             |  1 +
 project/build.properties |  2 +-
 project/publish.sbt      |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.ci/build b/.ci/build
index 3354e1a..02e9f6b 100755
--- a/.ci/build
+++ b/.ci/build
@@ -15,8 +15,12 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then
 
     # Set up publishing settings and credentials
     cat <<EOF > credentials.sbt
-    useGpg in Global := true
-    pgpSigningKey in Global := Some(0x488F99C904F077E8l)
+    credentials in Global += Credentials(
+      "GnuPG Key ID",
+      "gpg",
+      "DC7751D77486D755815C04AB488F99C904F077E8",
+      "ignored"
+    )
     credentials in Global += Credentials(
       "Sonatype Nexus Repository Manager",
       "oss.sonatype.org",
@@ -27,8 +31,8 @@ EOF
 
     # Publish and release
     sbt \
-	+sprayJsonDerivationJVM/publishSigned \
-	+sprayJsonDerivationJS/publishSigned \
-	+sprayJsonDerivationNative/publishSigned \
+	+sprayJsonDerivationJVM/publish \
+	+sprayJsonDerivationJS/publish \
+	+sprayJsonDerivationNative/publish \
 	sonatypeRelease
 fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54ffb7e..4d32aa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # UNRELEASED
 
 - Upgrade magnolia to official upstream, 0.10.0.
+- Upgrade sbt to 1.2.1 and use sbt-gpg.
 
 # Version 0.6.0
 
diff --git a/project/build.properties b/project/build.properties
index d6e3507..5620cc5 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.6
+sbt.version=1.2.1
diff --git a/project/publish.sbt b/project/publish.sbt
index 1c70137..b39e15a 100644
--- a/project/publish.sbt
+++ b/project/publish.sbt
@@ -1,2 +1,2 @@
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0")
-- 
cgit v1.2.3