From cab349c08889da8a47b08e6896edcdbe93d5f1c9 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Tue, 4 Oct 2022 13:26:16 -0400
Subject: [PATCH] [components] Update some Gradle dependencies

Also remove references to the obsolete androidmavenpublish plugin which was replaced previously.
---
 mobile/android/android-components/build.gradle      |  1 -
 .../buildSrc/src/main/java/Dependencies.kt          | 21 ++++++++++-----------
 .../components/lib/crash/sentry/SentryService.kt    |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/mobile/android/android-components/build.gradle b/mobile/android/android-components/build.gradle
index 9b9ffdb600ab..2ed30da0d9ff 100644
--- a/mobile/android/android-components/build.gradle
+++ b/mobile/android/android-components/build.gradle
@@ -30,7 +30,6 @@ buildscript {
     dependencies {
         classpath Dependencies.tools_androidgradle
         classpath Dependencies.tools_kotlingradle
-        classpath Dependencies.tools_androidmavenpublish
     }
 }
 
diff --git a/mobile/android/android-components/buildSrc/src/main/java/Dependencies.kt b/mobile/android/android-components/buildSrc/src/main/java/Dependencies.kt
index 449210bd65c2..ae063b6ab566 100644
--- a/mobile/android/android-components/buildSrc/src/main/java/Dependencies.kt
+++ b/mobile/android/android-components/buildSrc/src/main/java/Dependencies.kt
@@ -10,28 +10,28 @@ object Versions {
     const val kotlin = "1.6.10"
     const val coroutines = "1.6.1"
 
-    const val junit = "4.12"
-    const val robolectric = "4.8.1"
-    const val mockito = "3.11.2"
+    const val junit = "4.13.2"
+    const val robolectric = "4.9"
+    const val mockito = "3.12.4"
     const val maven_ant_tasks = "2.1.3"
 
+    // TO-DO: These could be kept in sync in the future
     const val mockwebserver = "3.10.0"
+    const val okhttp = "3.13.1"
 
     const val android_gradle_plugin = "7.3.0"
-    const val android_maven_publish_plugin = "3.6.2"
 
     // This has to be synced to the gradlew plugin version. See
     // http://googlesamples.github.io/android-custom-lint-rules/api-guide/example.md.html#example:samplelintcheckgithubproject/lintversion?
     const val lint = "30.3.0"
     const val detekt = "1.19.0"
 
-    const val sentry_legacy = "1.7.21"
-    const val sentry_latest = "5.7.3"
-    const val okhttp = "3.13.1"
-    const val zxing = "3.3.0"
-    const val jna = "5.8.0"
+    const val sentry_legacy = "1.7.30"
+    const val sentry_latest = "6.4.2"
+    const val zxing = "3.5.0"
+    const val jna = "5.12.1"
     const val disklrucache = "2.0.2"
-    const val leakcanary = "2.8.1"
+    const val leakcanary = "2.9.1"
 
     const val mozilla_appservices = "94.2.1"
 
@@ -149,7 +149,6 @@ object Dependencies {
 
     const val tools_androidgradle = "com.android.tools.build:gradle:${Versions.android_gradle_plugin}"
     const val tools_kotlingradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
-    const val tools_androidmavenpublish = "digital.wup:android-maven-publish:${Versions.android_maven_publish_plugin}"
 
     const val tools_lint = "com.android.tools.lint:lint:${Versions.lint}"
     const val tools_lintapi = "com.android.tools.lint:lint-api:${Versions.lint}"
diff --git a/mobile/android/android-components/components/lib/crash-sentry/src/main/java/mozilla/components/lib/crash/sentry/SentryService.kt b/mobile/android/android-components/components/lib/crash-sentry/src/main/java/mozilla/components/lib/crash/sentry/SentryService.kt
index 1850b22382d4..c6706c894f37 100644
--- a/mobile/android/android-components/components/lib/crash-sentry/src/main/java/mozilla/components/lib/crash/sentry/SentryService.kt
+++ b/mobile/android/android-components/components/lib/crash-sentry/src/main/java/mozilla/components/lib/crash/sentry/SentryService.kt
@@ -126,7 +126,7 @@ class SentryService(
             // Disable uncaught non-native exceptions from being reported.
             // We already have our own uncaught exception handler [ExceptionHandler],
             // so we don't need Sentry's default one.
-            options.enableUncaughtExceptionHandler = false
+            options.setEnableUncaughtExceptionHandler(false)
             // Disable uncaught native exceptions from being reported.
             // Sentry don't have a way to disable uncaught native exceptions from being reported.
             // As a fallback we had to disable all native integrations.
-- 
2.11.4.GIT