# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1449174569 28800
# Node ID ced663d2e957032178967296dab0bf896d715e57
# Parent  592f0ef08d94c227b970475f5c809b6fd7e493f0
migrate from Eclipse to Android Studio

diff -r 592f0ef08d94 -r ced663d2e957 Makefile
--- a/Makefile	Thu Dec 03 12:13:52 2015 -0800
+++ b/Makefile	Thu Dec 03 12:29:29 2015 -0800
@@ -4,9 +4,6 @@
 style:=release
 dest:=/run/user/1000/gvfs/mtp*/*torage/Download
 apk:='app/build/outputs/apk/510Connectbot-$(style).apk'
-ver:=$(shell grep versionName app/src/main/AndroidManifest.xml | cut -d'"' -f2)
-id:=$(shell hg id --id)
-da:=$(shell date +%Y-%m-%d)
 version:=\
 <?xml version=\"1.0\" encoding=\"utf-8\"?>\n\
 <resources>\n\
@@ -14,9 +11,9 @@
 </resources>\n
 
 ifeq ($(style),release)
-    task=assembleRelease
+    task:=assembleRelease
 else
-	task=assembleDebug
+	task:=assembleDebug
 endif
 
 
@@ -26,6 +23,9 @@
 
 builder: prep
 	rm -rf app/build/*
+    ver:=$(shell grep versionName app/src/main/AndroidManifest.xml | cut -d'"' -f2)
+    id:=$(shell hg id --id)
+    da:=$(shell date +%Y-%m-%d)
 	echo -e "$(version)" >app/src/main/res/values/version.xml
 	cat app/src/main/res/values/version.xml
 	./gradlew $(task)
diff -r 592f0ef08d94 -r ced663d2e957 app/build.gradle
--- a/app/build.gradle	Thu Dec 03 12:13:52 2015 -0800
+++ b/app/build.gradle	Thu Dec 03 12:29:29 2015 -0800
@@ -50,7 +50,9 @@
             }
             else {
                 def read = System.in.newReader().&readLine
+                print "\nkey store password"
                 storePassword = read()
+                print "\nkey alias password"
                 keyPassword   = read()
             }
             storeFile = file("../510Connectbot.keystore")