From 229c501bc9383521e7b3e550c7c9fcb7a3b7e949 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sat, 11 May 2024 15:07:55 +0200
Subject: [PATCH] [android] Update gradle plugun and androidx deps

Signed-off-by: Alexander Borsuk <me@alex.bio>
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
---
 android/app/build.gradle                 | 12 ++++++------
 android/app/src/main/AndroidManifest.xml |  2 +-
 android/build.gradle                     |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 64f0cac06b..3b7dc6cff7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -22,7 +22,7 @@ buildscript {
       googleFirebaseServicesDefault
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.3.2'
+    classpath 'com.android.tools.build:gradle:8.4.1'
 
     if (googleFirebaseServicesEnabled) {
       println('Building with Google Firebase Services')
@@ -376,19 +376,19 @@ dependencies {
   // > A failure occurred while executing com.android.build.gradle.internal.tasks.CheckDuplicatesRunnable
   // 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 'androidx.core:core:1.13.1'
   implementation(platform('org.jetbrains.kotlin:kotlin-bom:1.9.23'))
-  implementation 'androidx.annotation:annotation:1.7.1'
+  implementation 'androidx.annotation:annotation:1.8.0'
   implementation 'androidx.appcompat:appcompat:1.6.1'
   implementation 'androidx.car.app:app:1.7.0-alpha02'
   implementation 'androidx.car.app:app-projected:1.7.0-alpha02'
   implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-  implementation 'androidx.fragment:fragment:1.6.2'
+  implementation 'androidx.fragment:fragment:1.7.1'
   implementation 'androidx.preference:preference:1.2.1'
   implementation 'androidx.recyclerview:recyclerview:1.3.2'
   implementation 'androidx.work:work-runtime:2.9.0'
-  implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
-  implementation 'com.google.android.material:material:1.11.0'
+  implementation 'androidx.lifecycle:lifecycle-process:2.8.0'
+  implementation 'com.google.android.material:material:1.12.0'
   // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
   // https://github.com/organicmaps/organicmaps/issues/6106
   implementation 'com.google.guava:guava:33.1.0-android'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 3994c1e3cc..5edfb32bb2 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
     Android 13 (API level 33) and higher supports a runtime permission for sending non-exempt (including Foreground
     Services (FGS)) notifications from an app.
   //-->
-  <uses-permission-sdk-23 android:name="android.permission.POST_NOTIFICATIONS"/>
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
   <uses-permission android:name="androidx.car.app.NAVIGATION_TEMPLATES"/>
   <uses-permission android:name="androidx.car.app.ACCESS_SURFACE"/>
diff --git a/android/build.gradle b/android/build.gradle
index c9adf78d21..af0515fbfe 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.3.2' apply false
-    id 'com.android.library' version '8.3.2' apply false
+    id 'com.android.application' version '8.4.1' apply false
+    id 'com.android.library' version '8.4.1' apply false
 }