From 9f7357f1fc5314afbcd0d81a4107d39c881c1f8c Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 8 May 2024 08:31:18 +0700
Subject: [PATCH] chore(oem/fv/android): Update dependencies

---
 oem/firstvoices/android/app/build.gradle               | 10 +++++-----
 .../keyboards/FVKeyboardSettingsActivity.java          |  1 +
 .../com/firstvoices/keyboards/PackageActivity.java     |  1 +
 oem/firstvoices/android/build.gradle                   |  4 ++--
 .../android/gradle/wrapper/gradle-wrapper.properties   |  2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle
index 43adc17265c..a0ccc015714 100644
--- a/oem/firstvoices/android/app/build.gradle
+++ b/oem/firstvoices/android/app/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'io.sentry.android.gradle'
-    id 'com.github.triplet.play' version '3.8.1' apply false
+    id 'com.github.triplet.play' version '3.9.1' apply false
 }
 
 ext.rootPath = '../../../../android'
@@ -118,11 +118,11 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
-    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.12.0'
     api(name: 'keyman-engine', ext: 'aar')
-    implementation 'io.sentry:sentry-android:6.9.2'
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'io.sentry:sentry-android:7.8.0'
+    implementation 'androidx.preference:preference:1.2.1'
 }
 
 apply plugin: 'com.android.application'
diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java
index 73091153261..6aa7223602f 100644
--- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java
+++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java
@@ -405,6 +405,7 @@ public boolean onSupportNavigateUp() {
 
   @Override
   public void onBackPressed() {
+    super.onBackPressed();
     finish();
   }
 
diff --git a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java
index a34da65b417..21fc8765bff 100644
--- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java
+++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/PackageActivity.java
@@ -155,6 +155,7 @@ protected void onNewIntent(Intent intent) {
 
   @Override
   public void onBackPressed() {
+    super.onBackPressed();
     finish();
     overridePendingTransition(0, android.R.anim.fade_out);
   }
diff --git a/oem/firstvoices/android/build.gradle b/oem/firstvoices/android/build.gradle
index 50f3647165c..2a083bca94e 100644
--- a/oem/firstvoices/android/build.gradle
+++ b/oem/firstvoices/android/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
-        classpath 'io.sentry:sentry-android-gradle-plugin:2.1.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'io.sentry:sentry-android-gradle-plugin:4.5.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties b/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties
index ae04661ee73..774fae87671 100644
--- a/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties
+++ b/oem/firstvoices/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists