From 2787785f38595d3a1d77c0839e94fb86e7bc9f71 Mon Sep 17 00:00:00 2001
From: Artem Zinnatullin <ceo@artemzin.com>
Date: Mon, 30 Sep 2019 14:26:12 -0700
Subject: [PATCH] Fix artifact signing

---
 ci                            | 11 ++++++-----
 gradle/publish-android.gradle |  5 +++++
 gradle/publish.gradle         |  8 +++++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ci b/ci
index 4f57dae..67d81da 100755
--- a/ci
+++ b/ci
@@ -4,7 +4,7 @@ set -euo pipefail
 # You can run it from any directory.
 PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-pushd "$PROJECT_DIR"
+pushd "$PROJECT_DIR" > /dev/null
 
 # Export "PUBLISH_RELEASE=true" to initiate release process.
 if [ "${PUBLISH_RELEASE:-}" != "true" ]; then
@@ -13,22 +13,22 @@ if [ "${PUBLISH_RELEASE:-}" != "true" ]; then
 else
     echo "Launching release publishing process..."
 
-    if [ -z "$GPG_SECRET_KEYS" ]; then
+    if [ -z "${GPG_SECRET_KEYS:-}" ]; then
         echo "Put base64 encoded gpg secret key for signing into GPG_SECRET_KEYS env variable."
         exit 1
     fi
 
-    if [ -z "$GPG_OWNERTRUST" ]; then
+    if [ -z "${GPG_OWNERTRUST:-}" ]; then
         echo "Put base64 encoded gpg ownertrust for signing into GPG_OWNERTRUST env variable."
         exit 1
     fi
 
-    if [ -z "$GPG_KEY_ID" ]; then
+    if [ -z "${GPG_KEY_ID:-}" ]; then
         echo "Put GPG key id into GPG_KEY_ID env variable."
         exit 1
     fi
 
-    if [ -z "$GPG_PASSPHRASE" ]; then
+    if [ -z "${GPG_PASSPHRASE:-}" ]; then
         echo "Put GPG passphrase into GPG_PASSPHRASE env variable."
         exit 1
     fi
@@ -54,6 +54,7 @@ else
     unset GPG_OWNERTRUST
 
     ./gradlew --stacktrace --info build publishToSonatype -Psigning.keyId="$GPG_KEY_ID" -Psigning.password="$GPG_PASSPHRASE" -Psigning.secretKeyRingFile="$HOME/.gnupg/secring.gpg"
+    unset GPG_PASSPHRASE
 
     # Run closeAndReleaseRepository separately to avoid contention between publishing and closing.
     ./gradlew --stacktrace --info closeAndReleaseRepository
diff --git a/gradle/publish-android.gradle b/gradle/publish-android.gradle
index d946585..df66480 100644
--- a/gradle/publish-android.gradle
+++ b/gradle/publish-android.gradle
@@ -10,6 +10,11 @@ task javadocJar(type: Jar, dependsOn: dokka) {
     from dokka.outputDirectory
 }
 
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
 project.afterEvaluate {
     publishing {
         publications {
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index d12ab56..f5abf23 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -33,9 +33,11 @@ task validatePublishing {
     }
 }
 
-signing {
-    required { gradle.taskGraph.hasTask("publishToSonatype") }
-    sign configurations.archives
+afterEvaluate {
+    signing {
+        required { gradle.taskGraph.hasTask("publishToSonatype") }
+        sign publishing.publications.LibraryPublication
+    }
 }
 
 nexusPublishing {