From 3a3577d3cac6499d085b62386da1350ffa02eec6 Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nosacky@gradle.com>
Date: Tue, 20 Oct 2020 15:34:45 +0200
Subject: [PATCH] Update distribution plugin. (#1079)

Also disable some unused build features to improve configuration time.
---
 app/build.gradle.kts               | 2 +-
 buildSrc/src/main/kotlin/Config.kt | 4 +---
 gradle.properties                  | 5 +++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3ee710621..908de25fe 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -91,7 +91,7 @@ android {
     }
 
     testOptions {
-        unitTests.apply { isReturnDefaultValues = true }
+        unitTests.isReturnDefaultValues = true
     }
 
     tasks.withType<Test>().configureEach {
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index d073c3167..2a66eb04e 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -4,7 +4,7 @@ object Config {
         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"
+        const val appDistribution = "com.google.firebase:firebase-appdistribution-gradle:2.0.1"
         const val androidJunit5 = "de.mannodermaus.gradle.plugins:android-junit5:1.6.2.0"
     }
 
@@ -96,8 +96,6 @@ object Config {
         object Misc {
             const val sentry = "io.sentry:sentry-android:2.2.2"
             const val jackson = "com.fasterxml.jackson.module:jackson-module-kotlin:2.11.3"
-            const val threeTenBp = "org.threeten:threetenbp:1.4.0"
-            const val javaxInject = "javax.inject:javax.inject:1"
             const val blurView = "com.eightbitlab:blurview:1.6.3"
             const val iconDialog = "com.maltaisn:icondialog:3.3.0"
             const val iconDialogMaterial = "com.maltaisn:iconpack-community-material:5.3.45"
diff --git a/gradle.properties b/gradle.properties
index 65d129a4e..9b03da3e7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,3 +26,8 @@ org.gradle.parallel=true
 org.gradle.vfs.watch=true
 
 android.nonTransitiveRClass=true
+
+android.defaults.buildfeatures.aidl=false
+android.defaults.buildfeatures.renderscript=false
+android.defaults.buildfeatures.resvalues=false
+android.defaults.buildfeatures.shaders=false
\ No newline at end of file