From 87ae44fa1ad77c977860cd28e80c01100fd69f19 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 17 Aug 2020 16:24:12 -0500
Subject: [PATCH] Update version and changelog

---
 CHANGELOG.md                                        | 7 ++++---
 app/build.gradle.kts                                | 2 +-
 app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt | 2 --
 app/src/main/res/values/changelog.xml               | 4 ++--
 gradle.properties                                   | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8da2b26ba..382f761cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,11 @@
 Change Log
 ---
 =======
-### 10.0 (2020-08-14)
+### 10.0 (2020-08-18)
 
-🚧 Currently in alpha ([signup here](https://www.reddit.com/r/tasks/comments/i3onqr/100_alpha/)) 🚧
+🚧 Currently in beta ([signup here](https://www.reddit.com/r/tasks/comments/i3onqr/100_alpha/)) 🚧
 
-* PRO: DAVx⁵ support (alpha requires [custom DAVx⁵ build](https://www.reddit.com/r/tasks/comments/i3onqr/100_alpha/))
+* PRO: DAVx⁵ support (beta requires [custom DAVx⁵ build](https://www.reddit.com/r/tasks/comments/i3onqr/100_alpha/))
 * PRO: EteSync client support
 * [ToDo Agenda](https://play.google.com/store/apps/details?id=org.andstatus.todoagenda) integration
 * Changed backstack behavior to follow Android conventions
@@ -20,6 +20,7 @@ Change Log
   * Bengali - @Oymate
   * Brazilian Portuguese - Pedro Lucas Porcellis
   * Chinese - WH Julie
+  * Chuvash - İlle
   * Czech - @vitSkalicky, Radek Řehořek
   * Dutch - @fvbommel
   * Finnish - J. Lavoie
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 197a71887..c9842b402 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -44,7 +44,7 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 100004
+        versionCode = 100005
         versionName = "10.0"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt
index f5ae5433c..97c3dc4dc 100644
--- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt
+++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt
@@ -69,8 +69,6 @@ class TaskDao @Inject constructor(
 
     suspend fun getChildren(id: Long): List<Long> = taskDao.getChildren(id)
 
-    suspend fun getChildren(ids: List<Long>): List<Long> = taskDao.getChildren(ids)
-
     suspend fun setCollapsed(id: Long, collapsed: Boolean) = taskDao.setCollapsed(id, collapsed)
 
     suspend fun setCollapsed(preferences: Preferences, filter: Filter, collapsed: Boolean) =
diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml
index 5418aa962..a418287b0 100644
--- a/app/src/main/res/values/changelog.xml
+++ b/app/src/main/res/values/changelog.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="changelog">
-        <item>🚧 10.0 ALPHA 4 🚧</item>
-        <item>PRO: DAVx⁵ support (alpha requires custom DAVx⁵ build)</item>
+        <item>🚧 10.0 BETA 1 🚧</item>
+        <item>PRO: DAVx⁵ support (beta requires custom DAVx⁵ build)</item>
         <item>PRO: EteSync client support</item>
         <item>ToDo Agenda integration</item>
         <item>Changed backstack behavior to follow Android conventions</item>
diff --git a/gradle.properties b/gradle.properties
index c6fb1c58b..05ddbb7a2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -Dkotlin.daemon.jvm.options="-Xmx2g" -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.databinding.incremental=true