From 9dcc464a336ac921b2e4c361a219c43cdb79073f Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 17 Sep 2019 10:17:12 -0500
Subject: [PATCH] Target Android 10

---
 .idea/codeStyles/Project.xml         | 6 ------
 app/build.gradle.kts                 | 4 ++--
 buildSrc/src/main/kotlin/Versions.kt | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 1a51cfcd7..c79ad1a69 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,9 +7,7 @@
         <option name="TAB_SIZE" value="2" />
       </value>
     </option>
-    <option name="RIGHT_MARGIN" value="100" />
     <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
       <option name="LAYOUT_SETTINGS">
         <value>
           <option name="INSERT_BLANK_LINE_BEFORE_TAG" value="false" />
@@ -20,9 +18,6 @@
       <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="" withSubpackages="true" static="true" />
@@ -58,7 +53,6 @@
       </extensions>
     </Objective-C-extensions>
     <XML>
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
     <codeStyleSettings language="CSS">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b0e407b14..25ac59b94 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,14 +26,14 @@ android {
         textReport = true
     }
 
-    compileSdkVersion(Versions.compileSdk)
+    compileSdkVersion(Versions.targetSdk)
 
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
         versionCode = 607
         versionName = "6.8.1"
-        targetSdkVersion(Versions.compileSdk)
+        targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
         multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index cfa997fb9..1aaa04d1a 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,6 +1,6 @@
 object Versions {
     const val kotlin = "1.3.40"
-    const val compileSdk = 28
+    const val targetSdk = 29
     const val minSdk = 16
     const val dagger = "2.23.2"
     const val butterknife = "10.1.0"