From a8f895cb5c76a1a87298c4a55d76770257726197 Mon Sep 17 00:00:00 2001
From: Colin Lee <mncolinlee@gmail.com>
Date: Fri, 13 Dec 2019 13:29:27 -0600
Subject: [PATCH] For #4064: Replace prerelease R8 with improved Kotlin
 coroutines library (#7153)

---
 app/build.gradle                       | 1 +
 build.gradle                           | 4 ----
 buildSrc/src/main/java/Dependencies.kt | 4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2f7107f951..341f59aa52 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -368,6 +368,7 @@ dependencies {
 
     implementation Deps.kotlin_stdlib
     implementation Deps.kotlin_coroutines
+    implementation Deps.kotlin_coroutines_android
     testImplementation Deps.kotlin_coroutines_test
     implementation Deps.androidx_appcompat
     implementation Deps.androidx_constraintlayout
diff --git a/build.gradle b/build.gradle
index 08f1be0a96..663ee5f1fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,14 +2,10 @@
 
 buildscript {
     repositories {
-        // remove next line after Android Gradle Plugin 3.6.0+ is stable
-        maven { url "http://storage.googleapis.com/r8-releases/raw/master"}
         google()
         jcenter()
     }
     dependencies {
-        // remove next line after Android Gradle Plugin 3.6.0+ is stable
-        classpath Deps.tools_newestR8
         classpath Deps.tools_androidgradle
         classpath Deps.tools_kotlingradle
         classpath Deps.androidx_safeargs
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index f3674030c0..1875207294 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -4,9 +4,8 @@
 
 object Versions {
     const val kotlin = "1.3.30"
-    const val coroutines = "1.3.1"
+    const val coroutines = "1.3.3"
     const val android_gradle_plugin = "3.5.0"
-    const val newest_r8 = "ceaee94e172c6c057cc05e646f5324853fc5d4c5"
     const val rxAndroid = "2.1.0"
     const val rxKotlin = "2.3.0"
     const val rxBindings = "3.0.0-alpha2"
@@ -72,7 +71,6 @@ object Versions {
 @Suppress("unused")
 object Deps {
     const val tools_androidgradle = "com.android.tools.build:gradle:${Versions.android_gradle_plugin}"
-    const val tools_newestR8 = "com.android.tools:r8:${Versions.newest_r8}"
     const val tools_kotlingradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
     const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}"
     const val kotlin_coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}"