From 2f62e9515c1a6c2b40ef7135da5fb03cab78550d Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 6 Aug 2020 12:33:36 -0300
Subject: [PATCH] Upgrade gradle

---
 app/build.gradle                         | 5 ++++-
 build.gradle                             | 2 ++
 gradle.properties                        | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 6 +++---
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 gradle.properties

diff --git a/app/build.gradle b/app/build.gradle
index de921d5b..afcf4356 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,14 +129,17 @@ dependencies {
     lintChecks 'com.github.thirdegg:lint-rules:0.0.4-alpha'
 
     def junit_version = "5.5.2"
+    def mockk_version = "1.10.0"
     testImplementation aospDeps
     testImplementation 'androidx.test.ext:junit:1.1.1'
     testImplementation 'org.robolectric:robolectric:4.3.1'
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
-    testImplementation 'io.mockk:mockk:1.9.3'
+    testImplementation "io.mockk:mockk:$mockk_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junit_version"
 
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "io.mockk:mockk-android:$mockk_version"
 }
diff --git a/build.gradle b/build.gradle
index 65385e66..449e85d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,8 @@
 
 buildscript {
 
+    // 1.3.21 Android 10
+    // 1.3.72 AOSP master (2020-08)
     ext.kotlin_version = '1.3.61'
 
     repositories {
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..f3edb44c
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,3 @@
+org.gradle.jvmargs=-Xmx1g
+android.useAndroidX=true
+android.enableJetifier=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 39c9f096..9ff0d9fc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Thu Nov 08 02:00:38 GMT 2018
+#Tue Aug 04 14:40:48 BRT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
-distributionSha256Sum=14cd15fc8cc8705bd69dcfa3c8fefb27eb7027f5de4b47a8b279218f76895a91
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionSha256Sum=143a28f54f1ae93ef4f72d862dbc3c438050d81bb45b4601eb7076e998362920