From 48b0d2fcff150234ff52a701ac1d510483fe19d7 Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nosacky@gradle.com>
Date: Wed, 14 Oct 2020 17:39:01 +0200
Subject: [PATCH] Update AGP, Kotlin. (#1047)

This commit also enables the room incremental annotation processor.
This also fixes the export schema warning in the console logs.
---
 app/build.gradle.kts                                        | 6 ++++++
 .../homeassistant/companion/android/database/AppDatabase.kt | 3 ++-
 buildSrc/src/main/kotlin/Config.kt                          | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index aa8b53819..e38ea727e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,6 +21,12 @@ android {
         versionCode = System.getenv("VERSION_CODE")?.toIntOrNull() ?: 1
 
         manifestPlaceholders["sentryRelease"] = "$applicationId@$versionName"
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments(mapOf("room.incremental" to "true"))
+            }
+        }
     }
 
     buildFeatures {
diff --git a/app/src/main/java/io/homeassistant/companion/android/database/AppDatabase.kt b/app/src/main/java/io/homeassistant/companion/android/database/AppDatabase.kt
index 22c58c647..9bb70b045 100644
--- a/app/src/main/java/io/homeassistant/companion/android/database/AppDatabase.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/database/AppDatabase.kt
@@ -44,7 +44,8 @@ import kotlinx.coroutines.runBlocking
         StaticWidgetEntity::class,
         TemplateWidgetEntity::class
     ],
-    version = 12
+    version = 12,
+    exportSchema = false
 )
 abstract class AppDatabase : RoomDatabase() {
     abstract fun authenticationDao(): AuthenticationDao
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index e44c63a95..6e43544c7 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,7 +1,7 @@
 object Config {
 
     object Plugin {
-        const val android = "com.android.tools.build:gradle:4.0.2"
+        const val android = "com.android.tools.build:gradle:4.1.0"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Dependency.Kotlin.version}"
         const val google = "com.google.gms:google-services:4.3.4"
         const val appDistribution = "com.google.firebase:firebase-appdistribution-gradle:1.4.0"
@@ -23,7 +23,7 @@ object Config {
 
     object Dependency {
         object Kotlin {
-            const val version = "1.3.72"
+            const val version = "1.4.10"
             const val core = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${version}"
 
             private const val coroutinesVersion = "1.3.3"