From 284cf640f6f19cbef6dde9862a532cded470eb91 Mon Sep 17 00:00:00 2001
From: David Chang <changd@dropbox.com>
Date: Wed, 19 Aug 2020 17:05:25 -0700
Subject: [PATCH] Update signing method

---
 gradle/maven-push.gradle         | 5 -----
 tools/release/deploy_snapshot.sh | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gradle/maven-push.gradle b/gradle/maven-push.gradle
index 9f25399b5..51f653d37 100644
--- a/gradle/maven-push.gradle
+++ b/gradle/maven-push.gradle
@@ -91,11 +91,6 @@ afterEvaluate { project ->
 
     signing {
         required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-
-        def signingKeyId = findProperty("signingKeyId")
-        def signingKey = new File(rootProject.projectDir, "tools/release/secring.gpg").toString()
-        def signingPassword = findProperty("signingPassword")
-        useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
         sign configurations.archives
     }
 
diff --git a/tools/release/deploy_snapshot.sh b/tools/release/deploy_snapshot.sh
index 182216a9d..0b32df3fd 100755
--- a/tools/release/deploy_snapshot.sh
+++ b/tools/release/deploy_snapshot.sh
@@ -22,6 +22,7 @@ elif [ "$TRAVIS_BRANCH" != "$BRANCH" ]; then
 else
   echo "Deploying store..."
   openssl aes-256-cbc -md sha256 -d -in tools/release/secring.gpg.aes -out tools/release/secring.gpg -k "${ENCRYPT_KEY}"
-  ./gradlew uploadArchives -PSONATYPE_USERNAME="${SONATYPE_USERNAME}" -PSONATYPE_PASSWORD="${SONATYPE_PASSWORD}" -PsigningKeyId="${SIGNING_ID}" -PsigningPassword="${SIGNING_PASSWORD}"
+  # https://docs.gradle.org/current/userguide/signing_plugin.html#sec:signatory_credentials
+  ./gradlew uploadArchives -PSONATYPE_USERNAME="${SONATYPE_USERNAME}" -PSONATYPE_PASSWORD="${SONATYPE_PASSWORD}" -Psigning.keyId="${SIGNING_ID}" -Psigning.password="${SIGNING_PASSWORD}" -Psigning.secretKeyRingFile=tools/release/secring.gpg
   echo "Store deployed!"
 fi