From 020ad4d324c2803990d2484cac87912a6f31b799 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sat, 9 Mar 2024 22:56:05 +0100 Subject: [PATCH] [android] Update Android Gradle Plugin to 8.3 Also update some dependencies Signed-off-by: Alexander Borsuk --- android/app/build.gradle | 18 ++++++++++-------- android/build.gradle | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f1297807e5..675f5aed76 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.2.1' + classpath 'com.android.tools.build:gradle:8.3.0' if (googleFirebaseServicesEnabled) { println('Building with Google Firebase Services') @@ -365,14 +365,14 @@ dependencies { // ls -la src/$flavor/java/app/organicmaps/location/GoogleFusedLocationProvider.java // ``` // - webImplementation 'com.google.android.gms:play-services-location:21.1.0' - googleImplementation 'com.google.android.gms:play-services-location:21.1.0' - huaweiImplementation 'com.google.android.gms:play-services-location:21.1.0' + webImplementation 'com.google.android.gms:play-services-location:21.2.0' + googleImplementation 'com.google.android.gms:play-services-location:21.2.0' + huaweiImplementation 'com.google.android.gms:play-services-location:21.2.0' // Google Firebase Services if (googleFirebaseServicesEnabled) { // Import the BoM for the Firebase platform - implementation platform('com.google.firebase:firebase-bom:32.7.1') + implementation platform('com.google.firebase:firebase-bom:32.7.4') // 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' @@ -402,9 +402,11 @@ dependencies { implementation 'net.jcip:jcip-annotations:1.0' // Test Dependencies - testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.8.0' - testImplementation 'org.mockito:mockito-inline:5.2.0' + androidTestImplementation 'androidx.test:core:1.5.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation 'org.mockito:mockito-core:5.8.0' + androidTestImplementation 'org.mockito:mockito-inline:5.2.0' } tasks.withType(JavaCompile) { diff --git a/android/build.gradle b/android/build.gradle index 08a9f22d37..c32b03d073 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.2.1' apply false - id 'com.android.library' version '8.2.1' apply false + id 'com.android.application' version '8.3.0' apply false + id 'com.android.library' version '8.3.0' apply false } -- 2.45.3