From a19f1470ff156186b944738a7d654913171dccc4 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Thu, 7 Jun 2018 13:41:11 -0700 Subject: Migrate from sbt-pgp to sbt-gpg --- .ci/build | 16 ++++++++++++---- project/publish.sbt | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.ci/build b/.ci/build index 1552974..6392484 100755 --- a/.ci/build +++ b/.ci/build @@ -7,13 +7,21 @@ sbt scalafmtCheck +test if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then # Setup gpg keys gpg --keyserver keyserver.ubuntu.com --recv-key "DC7751D77486D755815C04AB488F99C904F077E8" - openssl aes-256-cbc -K "$encrypted_c6e2aee6c53f_key" -iv "$encrypted_c6e2aee6c53f_iv" -in .ci/sec.gpg.enc -out sec.gpg -d + openssl aes-256-cbc \ + -K "$encrypted_c6e2aee6c53f_key" \ + -iv "$encrypted_c6e2aee6c53f_iv" \ + -in .ci/sec.gpg.enc \ + -out sec.gpg -d gpg --import sec.gpg # Set up publishing settings and credentials cat < credentials.sbt - useGpg := true - pgpSigningKey := Some(0x488F99C904F077E8l) + credentials in Global += Credentials( + "GnuPG Key ID", + "gpg", + "DC7751D77486D755815C04AB488F99C904F077E8", + "ignored" + ) credentials += Credentials( "Sonatype Nexus Repository Manager", "oss.sonatype.org", @@ -23,5 +31,5 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then EOF # Publish and release - sbt +publishSigned sonatypeRelease + sbt +publish sonatypeRelease fi diff --git a/project/publish.sbt b/project/publish.sbt index 8a0d471..869f5ab 100644 --- a/project/publish.sbt +++ b/project/publish.sbt @@ -1,2 +1,2 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") +addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.1.5") -- cgit v1.2.3