From 281861cac52e3e4adb9dd52a781bf5569aa91f80 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Mon, 24 Jul 2017 00:14:33 -0400
Subject: [PATCH] build.sh: read keystore from environment variables

---
 TestKeystore.jks | Bin 2270 -> 0 bytes
 build.sh         |  21 +++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 TestKeystore.jks

diff --git a/TestKeystore.jks b/TestKeystore.jks
deleted file mode 100644
index 83f0bc0e623567844b8c766625c23046a3a655a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2270
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
ae;cPK0$jU;Qc3N(zgoBHm%pukz3v~RUEXm3

diff --git a/build.sh b/build.sh
index 016a65de9..84cc46e4b 100755
--- a/build.sh
+++ b/build.sh
@@ -21,11 +21,6 @@ GRADLE="./gradlew --stacktrace"
 PACKAGE_NAME=org.isoron.uhabits
 OUTPUTS_DIR=uhabits-android/build/outputs
 
-KEYFILE="TestKeystore.jks"
-KEY_ALIAS="default"
-KEY_PASSWORD="qwe123" 
-STORE_PASSWORD="qwe123"
-
 if [ ! -f "${ANDROID_HOME}/platform-tools/adb" ]; then
 	echo "Error: ANDROID_HOME is not set correctly"
 	exit 1
@@ -83,9 +78,13 @@ run_adb_as_root() {
 
 build_apk() {
 	if [ ! -z $RELEASE ]; then
+		if [ -z "$KEY_FILE" -o -z "$STORE_PASSWORD" -o -z "$KEY_ALIAS" -o -z "$KEY_PASSWORD" ]; then
+			log_error "Environment variables KEY_FILE, KEY_ALIAS, KEY_PASSWORD and STORE_PASSWORD must be defined"
+			exit 1
+		fi
 		log_info "Building release APK"
 		./gradlew assembleRelease \
-			-Pandroid.injected.signing.store.file=$KEYFILE \
+			-Pandroid.injected.signing.store.file=$KEY_FILE \
 			-Pandroid.injected.signing.store.password=$STORE_PASSWORD \
 			-Pandroid.injected.signing.key.alias=$KEY_ALIAS \
 			-Pandroid.injected.signing.key.password=$KEY_PASSWORD || fail
@@ -99,7 +98,7 @@ build_instrumentation_apk() {
 	log_info "Building instrumentation APK"
 	if [ ! -z $RELEASE ]; then
 		$GRADLE assembleAndroidTest  \
-			-Pandroid.injected.signing.store.file=$KEYFILE \
+			-Pandroid.injected.signing.store.file=$KEY_FILE \
 			-Pandroid.injected.signing.store.password=$STORE_PASSWORD \
 			-Pandroid.injected.signing.key.alias=$KEY_ALIAS \
 			-Pandroid.injected.signing.key.password=$KEY_PASSWORD || fail
@@ -191,7 +190,11 @@ fetch_logcat() {
 
 run_jvm_tests() {
 	log_info "Running JVM tests"
-	$GRADLE testDebugUnitTest :uhabits-core:check || fail
+	if [ ! -z $RELEASE ]; then
+		$GRADLE testReleaseUnitTest :uhabits-core:check || fail
+	else
+		$GRADLE testDebugUnitTest :uhabits-core:check || fail
+	fi
 }
 
 uninstall_test_apk() {
@@ -245,6 +248,8 @@ parse_opts() {
 
 case "$1" in
 	build)
+		shift; parse_opts $*
+
 		build_apk
 		build_instrumentation_apk
 		run_jvm_tests