From 1787f18eb7a4356b282d4f27c6ddd460fa4b9f80 Mon Sep 17 00:00:00 2001
From: Ahmed El-Helw <ahmedre@gmail.com>
Date: Tue, 7 Apr 2020 01:40:33 +0400
Subject: [PATCH] Bump version to 3.0.0

Also, since the Android Gradle Plugin 3.6.2 fixes the Moshi issue, use
that version for release.
---
 app/build.gradle | 5 ++---
 app/proguard.cfg | 3 ---
 build.gradle     | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 49780861f5..e5fb768ae1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
   defaultConfig {
     minSdkVersion deps.android.build.minSdkVersion
     targetSdkVersion deps.android.build.targetSdkVersion
-    versionCode 2990
-    versionName "2.9.9"
+    versionCode 3000
+    versionName "3.0.0"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     multiDexEnabled true
   }
@@ -146,7 +146,6 @@ dependencies {
   implementation "com.squareup.okio:okio:2.4.3"
   implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
 
-  // remove metadata line from proguard.cfg upon updating to 1.9.3
   implementation 'com.squareup.moshi:moshi:1.9.2'
   kapt("com.squareup.moshi:moshi-kotlin-codegen:1.9.2")
 
diff --git a/app/proguard.cfg b/app/proguard.cfg
index fd397658e5..7c6e5ec5e4 100644
--- a/app/proguard.cfg
+++ b/app/proguard.cfg
@@ -52,6 +52,3 @@
 -keep interface com.squareup.moshi.** { *; }
 -dontwarn com.squareup.moshi.**
 -keep public class com.quran.labs.androidquran.dao.** { *; }
-
-# temporary until Moshi 1.9.3 due to square/moshi#1049
--keep class kotlin.Metadata { *; }
diff --git a/build.gradle b/build.gradle
index 8add1c20bc..8091dfb180 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.0.0-beta03'
+    classpath 'com.android.tools.build:gradle:3.6.2'
     classpath "io.fabric.tools:gradle:1.31.2"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     classpath "net.ltgt.gradle:gradle-errorprone-plugin:1.1.1"