From c4f67451dc32f258b0a59c9be299f9f6e68fd683 Mon Sep 17 00:00:00 2001
From: Areeb Jamal <jamal.areeb@gmail.com>
Date: Sun, 23 Jun 2019 20:40:25 +0530
Subject: [PATCH 1/3] chore: Remove verbose zipalign (#1742)

---
 scripts/update-apk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update-apk.sh b/scripts/update-apk.sh
index 8dfbdd3e9..324af6510 100755
--- a/scripts/update-apk.sh
+++ b/scripts/update-apk.sh
@@ -34,7 +34,7 @@ if [ "$TRAVIS_BRANCH" == "$PUBLISH_BRANCH" ]; then
     echo "Push to master branch detected, signing the app..."
     cp app-playStore-release-unsigned.apk app-playStore-release-unaligned.apk
 	jarsigner -verbose -tsa http://timestamp.comodoca.com/rfc3161 -sigalg SHA1withRSA -digestalg SHA1 -keystore ../scripts/key.jks -storepass $STORE_PASS -keypass $KEY_PASS app-playStore-release-unaligned.apk $ALIAS
-	${ANDROID_HOME}/build-tools/27.0.3/zipalign -v -p 4 app-playStore-release-unaligned.apk app-playStore-release.apk
+	${ANDROID_HOME}/build-tools/27.0.3/zipalign -p 4 app-playStore-release-unaligned.apk app-playStore-release.apk
 fi
 
 if [ "$TRAVIS_BRANCH" == "$PUBLISH_BRANCH" ]; then

From 2c1dbd8eef9903839c8f6fe41b93ff7748c8e49d Mon Sep 17 00:00:00 2001
From: Areeb Jamal <jamal.areeb@gmail.com>
Date: Sun, 23 Jun 2019 22:02:08 +0530
Subject: [PATCH 2/3] chore: Fix signing and release script (#1743)

---
 .travis.yml           | 3 ++-
 scripts/update-apk.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 94ce485a0..0971a08c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,8 @@ cache:
       - "$HOME/.gradle/caches/"
       - "$HOME/.gradle/wrapper/"
 script:
-  - ./gradlew build
+  - ./gradlew assemblePlayStoreRelease
+  - ./gradlew assembleFdroidRelease
   - ./gradlew testPlayStoreDebugUnitTestCoverage
 after_success:
     - bash <(curl -s https://codecov.io/bash)
diff --git a/scripts/update-apk.sh b/scripts/update-apk.sh
index 324af6510..8611c4d4c 100755
--- a/scripts/update-apk.sh
+++ b/scripts/update-apk.sh
@@ -33,8 +33,8 @@ fi
 if [ "$TRAVIS_BRANCH" == "$PUBLISH_BRANCH" ]; then
     echo "Push to master branch detected, signing the app..."
     cp app-playStore-release-unsigned.apk app-playStore-release-unaligned.apk
-	jarsigner -verbose -tsa http://timestamp.comodoca.com/rfc3161 -sigalg SHA1withRSA -digestalg SHA1 -keystore ../scripts/key.jks -storepass $STORE_PASS -keypass $KEY_PASS app-playStore-release-unaligned.apk $ALIAS
-	${ANDROID_HOME}/build-tools/27.0.3/zipalign -p 4 app-playStore-release-unaligned.apk app-playStore-release.apk
+	jarsigner -tsa http://timestamp.comodoca.com/rfc3161 -sigalg SHA1withRSA -digestalg SHA1 -keystore ../scripts/key.jks -storepass $STORE_PASS -keypass $KEY_PASS app-playStore-release-unaligned.apk $ALIAS
+	${ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION}/zipalign -p 4 app-playStore-release-unaligned.apk app-playStore-release.apk
 fi
 
 if [ "$TRAVIS_BRANCH" == "$PUBLISH_BRANCH" ]; then

From 9c1cecb418124950a1fec302b09c51d84479fdaf Mon Sep 17 00:00:00 2001
From: Areeb Jamal <jamal.areeb@gmail.com>
Date: Sun, 23 Jun 2019 22:20:34 +0530
Subject: [PATCH 3/3] chore: Remove debug JSON from build script (#1744)

---
 .travis.yml           | 2 +-
 scripts/update-apk.sh | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0971a08c9..6deb2eee7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ cache:
 script:
   - ./gradlew assemblePlayStoreRelease
   - ./gradlew assembleFdroidRelease
-  - ./gradlew testPlayStoreDebugUnitTestCoverage
+  - ./gradlew testPlayStoreReleaseUnitTestCoverage
 after_success:
     - bash <(curl -s https://codecov.io/bash)
     - bash scripts/prep-key.sh
diff --git a/scripts/update-apk.sh b/scripts/update-apk.sh
index 8611c4d4c..7fc92e8ae 100755
--- a/scripts/update-apk.sh
+++ b/scripts/update-apk.sh
@@ -23,9 +23,7 @@ fi
 
 \cp -r ../app/build/outputs/apk/playStore/*/**.apk .
 \cp -r ../app/build/outputs/apk/fdroid/*/**.apk .
-\cp -r ../app/build/outputs/apk/playStore/debug/output.json playStore-debug-output.json
 \cp -r ../app/build/outputs/apk/playStore/release/output.json playStore-release-output.json
-\cp -r ../app/build/outputs/apk/fdroid/debug/output.json fdroid-debug-output.json
 \cp -r ../app/build/outputs/apk/fdroid/release/output.json fdroid-release-output.json
 
 # Signing Apps