From 6c65e9008098d4a0eb00a2e970ab9b428f5257ec Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sat, 25 Nov 2023 11:15:44 +0100
Subject: [PATCH] [android] Upgrade agp to 8.1.4

Upgrade other dependencies too

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 android/app/build.gradle | 24 ++++++++++++------------
 android/build.gradle     |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 00945b3d55..ce7eb00fec 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -40,11 +40,11 @@ buildscript {
   ext.androidAutoEnabled = androidAutoFlag != null ? androidAutoFlag.toBoolean() : androidAutoDefault
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.1.3'
+    classpath 'com.android.tools.build:gradle:8.1.4'
 
     if (googleMobileServicesEnabled) {
       println('Building with Google Mobile Services')
-      classpath 'com.google.gms:google-services:4.3.15'
+      classpath 'com.google.gms:google-services:4.4.0'
     } else {
       println('Building without Google Services')
     }
@@ -52,12 +52,12 @@ buildscript {
     if (googleFirebaseServicesEnabled) {
       println('Building with Google Firebase Services')
       classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
-      classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.0'
+      classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.1'
     } else {
       println('Building without Google Firebase Services')
     }
 
-    classpath('com.github.triplet.gradle:play-publisher:3.8.4')
+    classpath('com.github.triplet.gradle:play-publisher:3.8.6')
     classpath('ru.cian:huawei-publish-gradle-plugin:1.4.0')
   }
 }
@@ -89,7 +89,7 @@ dependencies {
   // Google Firebase Services
   if (googleFirebaseServicesEnabled) {
     // Import the BoM for the Firebase platform
-    implementation platform('com.google.firebase:firebase-bom:32.2.3')
+    implementation platform('com.google.firebase:firebase-bom:32.6.0')
     // Add the dependencies for the Crashlytics and Analytics libraries
     // When using the BoM, you don't specify versions in Firebase library dependencies
     implementation 'com.google.firebase:firebase-crashlytics'
@@ -98,10 +98,10 @@ dependencies {
 
   if (androidAutoEnabled) {
     println('Building with Android Auto')
-    implementation 'androidx.car.app:app:1.4.0-beta02'
+    implementation 'androidx.car.app:app:1.4.0-rc01'
     // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
     // https://github.com/organicmaps/organicmaps/issues/6106
-    implementation 'com.google.guava:guava:32.1.2-android'
+    implementation 'com.google.guava:guava:32.1.3-android'
   } else {
     println('Building without Android Auto')
   }
@@ -111,22 +111,22 @@ dependencies {
   // We don't use Kotlin, but some dependencies are actively using it.
   // See https://stackoverflow.com/a/75719642
   implementation 'androidx.core:core:1.12.0'
-  implementation(platform('org.jetbrains.kotlin:kotlin-bom:1.9.10'))
+  implementation(platform('org.jetbrains.kotlin:kotlin-bom:1.9.21'))
   implementation 'androidx.annotation:annotation:1.7.0'
   implementation 'androidx.appcompat:appcompat:1.6.1'
   implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-  implementation 'androidx.fragment:fragment:1.6.1'
+  implementation 'androidx.fragment:fragment:1.6.2'
   implementation 'androidx.preference:preference:1.2.1'
-  implementation 'androidx.recyclerview:recyclerview:1.3.1'
+  implementation 'androidx.recyclerview:recyclerview:1.3.2'
   implementation 'androidx.work:work-runtime:2.8.1'
   implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
-  implementation 'com.google.android.material:material:1.9.0'
+  implementation 'com.google.android.material:material:1.10.0'
   implementation 'com.github.devnullorthrow:MPAndroidChart:3.2.0-alpha'
   implementation 'net.jcip:jcip-annotations:1.0'
 
   // Test Dependencies
   testImplementation 'junit:junit:4.13.2'
-  testImplementation 'org.mockito:mockito-core:5.5.0'
+  testImplementation 'org.mockito:mockito-core:5.7.0'
   testImplementation 'org.mockito:mockito-inline:5.2.0'
 }
 
diff --git a/android/build.gradle b/android/build.gradle
index 8a391ca830..bb1a72ac2b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.1.3' apply false
-    id 'com.android.library' version '8.1.3' apply false
+    id 'com.android.application' version '8.1.4' apply false
+    id 'com.android.library' version '8.1.4' apply false
 }