From bc802341bb22eafbb7381032f5cae7ef87f74700 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Tue, 18 May 2021 12:01:03 +0700
Subject: [PATCH] chore(android/app): Update dependencies

---
 android/KMAPro/.idea/runConfigurations.xml                | 1 +
 android/KMAPro/build.gradle                               | 7 +++++--
 android/KMAPro/gradle/wrapper/gradle-wrapper.properties   | 2 +-
 android/KMAPro/kMAPro/build.gradle                        | 8 ++++----
 .../main/java/com/tavultesoft/kmapro/InfoActivity.java    | 1 -
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/android/KMAPro/.idea/runConfigurations.xml b/android/KMAPro/.idea/runConfigurations.xml
index 7f68460d8b..e497da9998 100644
--- a/android/KMAPro/.idea/runConfigurations.xml
+++ b/android/KMAPro/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/android/KMAPro/build.gradle b/android/KMAPro/build.gradle
index c4bd1bb49a..9aefe771d2 100644
--- a/android/KMAPro/build.gradle
+++ b/android/KMAPro/build.gradle
@@ -6,9 +6,12 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'io.sentry:sentry-android-gradle-plugin:1.7.36'
-        classpath 'name.remal:gradle-plugins:1.0.157'
+        classpath 'name.remal:gradle-plugins:1.3.1'
+
+        // From jcenter() which could be sunset in future
+        // https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/
         classpath 'com.stepstone.stepper:material-stepper:4.3.1'
     }
 }
diff --git a/android/KMAPro/gradle/wrapper/gradle-wrapper.properties b/android/KMAPro/gradle/wrapper/gradle-wrapper.properties
index 5028f28f8e..4d9ca16491 100644
--- a/android/KMAPro/gradle/wrapper/gradle-wrapper.properties
+++ b/android/KMAPro/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle
index 30a19cf94d..4c19903bc8 100644
--- a/android/KMAPro/kMAPro/build.gradle
+++ b/android/KMAPro/kMAPro/build.gradle
@@ -10,7 +10,7 @@ apply from: "$rootPath/version.gradle"
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "30.0.2"
 
     // Don't compress kmp files so they can be copied via AssetManager
     aaptOptions {
@@ -119,11 +119,11 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'com.stepstone.stepper:material-stepper:4.3.1'
     api(name: 'keyman-engine', ext: 'aar')
-    implementation 'io.sentry:sentry-android:3.1.0'
+    implementation 'io.sentry:sentry-android:4.3.0'
     implementation 'androidx.preference:preference:1.1.1'
 
     // Add dependency for generating QR Codes
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
index 8929ef047a..32a1182a7e 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
@@ -5,7 +5,6 @@
 package com.tavultesoft.kmapro;
 
 import com.tavultesoft.kmea.BaseActivity;
-import com.tavultesoft.kmea.BuildConfig;
 
 import android.content.Context;
 import android.graphics.Bitmap;