From 1658f9791a815997cd0b2942aace8e5a9c5b197d Mon Sep 17 00:00:00 2001
From: Norbel AMBANUMBEN <norbel@openobservatory.org>
Date: Fri, 9 Feb 2024 14:36:40 +0100
Subject: [PATCH] chore: Update android gradle plugin, preference, lifecycle
 process, gson, material and firebase dependencies (#658)

## Proposed Changes

- Update android gradle plugin, preference, lifecycle process, gson,
material and firebase dependencies.
---
 app/build.gradle                         |  2 +-
 gradle/libs.versions.toml                | 17 ++++++++---------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 shared-test/build.gradle                 |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 42cbec3f3..46fcba036 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -139,7 +139,7 @@ dependencies {
     fullImplementation libs.google.play.core
 
 // Dependency Injection
-    implementation libs.google.dagger
+    implementation libs.google.dagger.lib
     kapt libs.google.dagger.compiler
 
 // Logger
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5f935b989..9ed68b3c1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.1.2"
+androidGradlePlugin = "8.2.2"
 barista = "3.9.0"
 countlySdk = "23.6.0"
 faker = "1.2.8"
@@ -18,19 +18,19 @@ androidxCore = "1.5.0"
 androidxRunner = "1.5.2"
 androidxAppCompat = "1.6.1"
 androidxConstraintlayout = "2.1.4"
-androidxLifecycleProcess = "2.5.1"
-androidxPreference = "1.2.0"
+androidxLifecycleProcess = "2.7.0"
+androidxPreference = "1.2.1"
 androidxLocalbroadcastmanager = "1.1.0"
 androidxLegacySupportV4 = "1.0.0"
 androidxJunit = "1.1.5"
 androidxEspressoCore = "3.5.1"
 
 # Google
-googleGson = "2.8.9"
+googleGson = "2.10"
 googleGuava = "30.1.1-android"
-googleMaterial = "1.6.1"
+googleMaterial = "1.11.0"
 googleDagger = "2.45"
-googleFirebaseBon = "26.3.0"
+googleFirebaseBon = "32.7.1"
 googlePlaycore = "1.10.3"
 
 # OONI
@@ -46,11 +46,10 @@ junit = "4.13.2"
 dbflow = "4.2.4"
 retrofitCore = "2.9.0"
 retrofitLoggingInterceptor = "4.9.1"
-butterknifeCore = "10.2.3"
 
 # Firebase Services
 # https://firebase.google.com/support/release-notes/android
-gms-googleServices = "4.3.15"
+gms-googleServices = "4.4.0"
 
 [libraries]
 # Dependencies of the included build-logic
@@ -97,7 +96,7 @@ google-gson = { module = "com.google.code.gson:gson", version.ref = "googleGson"
 google-guava = { module = "com.google.guava:guava", version.ref = "googleGuava" }
 google-material = { module = "com.google.android.material:material", version.ref = "googleMaterial" }
 google-dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "googleDagger" }
-google-dagger = { module = "com.google.dagger:dagger", version.ref = "googleDagger" }
+google-dagger-lib = { module = "com.google.dagger:dagger", version.ref = "googleDagger" }
 google-firebase-messaging = { module = "com.google.firebase:firebase-messaging"}
 google-firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "googleFirebaseBon" }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3a0290794..b93c46a5f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/shared-test/build.gradle b/shared-test/build.gradle
index 34d70a978..ed614df70 100644
--- a/shared-test/build.gradle
+++ b/shared-test/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation project(":app")
 
     // Dependency Injection (https://dagger.dev/)
-	implementation libs.google.dagger
+	implementation libs.google.dagger.lib
     kapt libs.google.dagger.compiler
 
     // Database Library (https://github.com/agrosner/DBFlow)