fix f-droid automatic updates

LibreShift · Sep 7, 2017 · 5529cb6 · 5529cb6
1 parent 233c921
commit 5529cb6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -46,8 +46,8 @@ android {
         applicationId "com.jmstudios.redmoon"
         minSdkVersion 17
         targetSdkVersion 25
-        versionCode 31
-        versionName "${org.ajoberstar.grgit.Grgit.open().describe()}"
+        versionCode 32
+        versionName "3.1.2"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [ eventBusIndex : 'com.jmstudios.redmoon.event.EventBusIndex' ]
@@ -62,7 +62,13 @@ android {
 
         debug {
             applicationIdSuffix '.debug'
-            versionNameSuffix '_DEBUG'
+            def repo = org.ajoberstar.grgit.Grgit.open()
+            def commitId = "${repo.log().get(0).getAbbreviatedId()}"
+            if (repo.status().isClean()) {
+                versionNameSuffix "-$commitId"
+            } else {
+                versionNameSuffix "-$commitId (dirty)"
+            }
         }
     }
     productFlavors {

diff --git a/app/src/main/java/com/jmstudios/redmoon/RedMoonApplication.kt b/app/src/main/java/com/jmstudios/redmoon/RedMoonApplication.kt
@@ -39,9 +39,9 @@ class RedMoonApplication: Application() {
             upgradeFrom(26)
         } in 26..27 -> {
             upgradeFrom(28)
-        } in 28..30 -> {
+        } in 28..31 -> {
             upgradeProfilesFrom(version)
-            upgradeFrom(31)
+            upgradeFrom(32)
         } else -> {
             Log.e("Didn't catch upgrades from version $version")
             upgradeFrom(version+1)

diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="3.1.2" versioncode="32" >
+        <change>Fix a bug where widgets and tiles did not work</change>
+    </release>
     <release version="3.1.1" versioncode="31" >
         <change>Fix a crash on Android 6.0 and earlier</change>
         <change>Enable finer control over behavior in secure apps</change>