From 5b5795b2fc040e9917d57d8b5b4ec5e35abaefb0 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 28 Aug 2020 13:16:32 -0500
Subject: [PATCH] Update changelog and version

---
 CHANGELOG.md                                  |  6 ++---
 app/build.gradle.kts                          |  2 +-
 app/licenses.yml                              | 10 +++++++
 app/src/main/assets/licenses.json             | 26 +++++++++++++++++++
 app/src/main/res/values/changelog.xml         |  3 +--
 .../android/en-US/changelogs/100009.txt       |  8 ++++++
 6 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/100009.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcd582b89..fbd9de052 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,9 @@
 Change Log
 ---
 =======
-### 10.0 (2020-08-26)
+### 10.0 (2020-08-28)
 
-🚧 Currently in beta ([signup here](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: DAVx⁵ support (currently requires [custom DAVx⁵ build](https://tasks.org/davx5))
 * 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
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d7b216265..1f3ef588a 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 = 100008
+        versionCode = 100009
         versionName = "10.0"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
diff --git a/app/licenses.yml b/app/licenses.yml
index 0186a0702..b4e1afe96 100644
--- a/app/licenses.yml
+++ b/app/licenses.yml
@@ -793,3 +793,13 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/license/LICENSE-2.0.txt
   url: https://github.com/dmfs/jems
+- artifact: org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:+
+  name: kotlinx-collections-immutable-jvm
+  copyrightHolder: JetBrains s.r.o.
+  license: The Apache Software License, Version 2.0
+- artifact: com.squareup.okio:okio:+
+  name: okio
+  copyrightHolder: Square, Inc.
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://github.com/square/okio/
diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json
index 175d790a0..fd4ae2afa 100644
--- a/app/src/main/assets/licenses.json
+++ b/app/src/main/assets/licenses.json
@@ -1884,6 +1884,32 @@
       "normalizedLicense": "apache2",
       "url": "https://github.com/dmfs/jems",
       "libraryName": "jems"
+    },
+    {
+      "artifactId": {
+        "name": "kotlinx-collections-immutable-jvm",
+        "group": "org.jetbrains.kotlinx",
+        "version": "+"
+      },
+      "copyrightHolder": "JetBrains s.r.o.",
+      "copyrightStatement": "Copyright &copy; JetBrains s.r.o. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "normalizedLicense": "apache2",
+      "libraryName": "kotlinx-collections-immutable-jvm"
+    },
+    {
+      "artifactId": {
+        "name": "okio",
+        "group": "com.squareup.okio",
+        "version": "+"
+      },
+      "copyrightHolder": "Square, Inc.",
+      "copyrightStatement": "Copyright &copy; Square, Inc. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+      "normalizedLicense": "apache2",
+      "url": "https://github.com/square/okio/",
+      "libraryName": "okio"
     }
   ]
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml
index 13a050dcd..c87b63a2c 100644
--- a/app/src/main/res/values/changelog.xml
+++ b/app/src/main/res/values/changelog.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="changelog">
-        <item>🚧 10.0 BETA 4 🚧</item>
-        <item>PRO: DAVx⁵ support (beta requires custom DAVx⁵ build)</item>
+        <item>PRO: DAVx⁵ support (visit https://tasks.org/davx5 for more info)</item>
         <item>PRO: EteSync client support</item>
         <item>ToDo Agenda integration</item>
         <item>Changed backstack behavior to follow Android conventions</item>
diff --git a/fastlane/metadata/android/en-US/changelogs/100009.txt b/fastlane/metadata/android/en-US/changelogs/100009.txt
new file mode 100644
index 000000000..c745c30bf
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/100009.txt
@@ -0,0 +1,8 @@
+* PRO: DAVx⁵ support (visit https://tasks.org/davx5 for more info)
+* PRO: EteSync client support
+* ToDo Agenda integration
+* Changed backstack behavior to follow Android conventions
+* Major internal changes! Please report any bugs!
+* Remove Mapbox tiles (Google Play only)
+* Added 'Astrid manual sort' information to backup file
+* Bug fixes, performance and security improvements, and translation updates