Updated version string for v1.6.1 release

Added some date/time checks to transaction tests
Development build output name now includes git revision, beta builds include only build number
Updated CHANGELOG

CHANGELOG.md

@@ -1,5 +1,16 @@
 Change Log
 ===============================================================================
+Version 1.6.1 *(2015-07-08)*
+----------------------------
+* Fixed: Crash when importing some scheduled transations with custom period strings
+* Fixed: Crash when closing export progress dialog if an export error occurred
+* Fixed: Crash when creating a sub-account and changing the account type 
+* Fixed: Crash when loading backup files with no timestamp in their name
+* Fixed: Crash when app is run on devices with locale es_LG
+* Improved: Updated betterpickers library
+* Improved: New dialogs for time and date when creating transactions
+* Improved: Added translation to Ukrainian
+
 Version 1.6.0 *(2015-06-20)*
 ----------------------------
 * Feature: Scheduled backups (QIF, OFX and XML)

app/build.gradle

@@ -5,8 +5,8 @@ apply plugin: 'crashlytics'
 
 def versionMajor = 1
 def versionMinor = 6
-def versionPatch = 0
-def versionBuild = 7
+def versionPatch = 1
+def versionBuild = 0
 
 def buildTime() {
     def df = new SimpleDateFormat("yyyyMMdd")
@@ -100,13 +100,13 @@ android {
             applicationId 'org.gnucash.android.devel'
             testApplicationId 'org.gnucash.android.devel.test'
             resValue "string", "app_name", "GnuCash-devel"
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}-dev${versionBuild}_${buildTime()}"
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}-dev${versionBuild}_r${gitSha()}"
             resValue "string", "app_version_name", "${versionName}"
         }
 
         beta {
             resValue "string", "app_name", "GnuCash - beta"
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}-beta${versionBuild}_r${gitSha()}"
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}-beta${versionBuild}"
             resValue "string", "app_version_name", "${versionName}"
             buildConfigField "boolean", "USE_CRASHLYTICS", "true"
         }

app/src/androidTest/java/org/gnucash/android/test/ui/TransactionsActivityTest.java

@@ -222,7 +222,8 @@ private void validateEditTransactionFields(Transaction transaction){
 		formatter.setMinimumFractionDigits(2);
 		formatter.setMaximumFractionDigits(2);
 		onView(withId(R.id.input_transaction_amount)).check(matches(withText(formatter.format(balance.asDouble()))));
-
+		onView(withId(R.id.input_date)).check(matches(withText(TransactionFormFragment.DATE_FORMATTER.format(transaction.getTimeMillis()))));
+		onView(withId(R.id.input_time)).check(matches(withText(TransactionFormFragment.TIME_FORMATTER.format(transaction.getTimeMillis()))));
 		onView(withId(R.id.input_description)).check(matches(withText(transaction.getNote())));
 
 		validateTimeInput(transaction.getTimeMillis());