Update version and changelog

CHANGELOG.md

@@ -1,5 +1,10 @@
 Change Log
 ---
+### 7.0 (2019-11-12)
+
+* Add support for CalDAV subtasks (Android 5+) - @creywood
+* Display Google subtasks in all sort modes (Android 5+)
+
 ### 6.9.3 (2019-10-31)
 
 * Fix disappearance of remotely completed recurring Google Tasks

app/build.gradle.kts

@@ -31,8 +31,8 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 616
-        versionName = "6.9.3"
+        versionCode = 619
+        versionName = "7.0"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
         multiDexEnabled = true

app/src/main/java/com/todoroo/astrid/service/Upgrader.java

@@ -52,7 +52,7 @@ public class Upgrader {
   private static final int V6_7 = 585;
   private static final int V6_8_1 = 607;
   private static final int V6_9 = 608;
-  private static final int V6_10 = 617;
+  private static final int V7_0 = 617;
   private final Preferences preferences;
   private final Tracker tracker;
   private final TagDataDao tagDataDao;
@@ -102,7 +102,7 @@ public class Upgrader {
       run(from, V6_7, this::migrateGoogleTaskFilters);
       run(from, V6_8_1, this::migrateCaldavFilters);
       run(from, V6_9, this::applyCaldavCategories);
-      run(from, V6_10, this::applyCaldavSubtasks);
+      run(from, V7_0, this::applyCaldavSubtasks);
       tracker.reportEvent(Tracking.Events.UPGRADE, Integer.toString(from));
     }
     preferences.setCurrentVersion(to);