Merge remote-tracking branch 'origin/master'

LibreShift · Oct 2, 2017 · 80ffa57 · 80ffa57
2 parents 443707a + 91e95c7
commit 80ffa57
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 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 34
-        versionName "3.3.0"
+        versionCode 35
+        versionName "3.3.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/jmstudios/redmoon/RedMoonApplication.kt b/app/src/main/java/com/jmstudios/redmoon/RedMoonApplication.kt
@@ -47,6 +47,9 @@ class RedMoonApplication: Application() {
             ScheduleReceiver.rescheduleOnCommand()
             ScheduleReceiver.rescheduleOffCommand()
             upgradeFrom(34)
+        } 34 -> {
+            upgradeFrom(35)
+        }
         } 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,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
-    <release version="3.2.0" versioncode="33" >
+    <release version="3.3.1" versioncode="35" >
+        <change>Update translations: Serbian, Japanese, Polish, Turkish, Romanian, Ukrainian, Korean</change>
+    </release>
+    <release version="3.3.0" versioncode="34" >
         <change>Pause in *excluded* apps: you can now control this feature via the notification</change>
         <change>Added Romanian translation (Ervin Bolat).</change>
         <change>Fixed a bug where backlight brightness was not restored</change>