From 404b5c2c0790a8dd522a5bcfe6eac0caac6e0f4f Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 29 May 2020 08:18:45 -0500
Subject: [PATCH] Android Studio 4.0

---
 .travis.yml                              |  2 +-
 app/build.gradle.kts                     | 17 +++++++----------
 build.gradle.kts                         |  3 +--
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dfc388ae5..ec7b51262 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,7 +83,7 @@ install:
 
 script:
   - ./gradlew :app:lintGoogleplayRelease
-  - ./gradlew :app:jacocoTestReport
+  - ./gradlew :app:jacocoTestReportGoogleplayDebug
   - ./gradlew -Pcoverage :app:createGoogleplayDebugAndroidTestCoverageReport
 
 before_cache:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a5b5cb6ea..9373abeb6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     kotlin("kapt")
     id("com.cookpad.android.plugin.license-tools") version "1.2.2"
     id("com.github.ben-manes.versions") version "0.28.0"
-    id("jacoco-android")
+    id("com.vanniktech.android.junit.jacoco") version "0.16.0"
 }
 
 repositories {
@@ -26,8 +26,13 @@ android {
         }
     }
 
+    buildFeatures {
+        viewBinding = true
+        dataBinding = true
+    }
+
     lintOptions {
-        setLintConfig(file("lint.xml"))
+        lintConfig = file("lint.xml")
         textOutput("stdout")
         textReport = true
     }
@@ -104,14 +109,6 @@ android {
         }
     }
 
-    viewBinding {
-        isEnabled = true
-    }
-
-    dataBinding {
-        isEnabled = true
-    }
-
     packagingOptions {
         exclude("META-INF/*.kotlin_module")
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index c25eade3a..961a82df5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,12 +6,11 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:3.6.3")
+        classpath("com.android.tools.build:gradle:4.0.0")
         classpath("com.google.gms:google-services:4.3.3")
         // https://docs.fabric.io/android/changelog.html#fabric-gradle-plugin
         classpath("io.fabric.tools:gradle:1.31.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
-        classpath("com.dicedmelon.gradle:jacoco-android:0.1.4")
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da2725afb..b868e3822 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 10 14:27:48 CST 2020
+#Thu May 28 17:10:25 CDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip