RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Upgrade agp to 8.1.4

Browse source 
Upgrade other dependencies too

Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2023-11-25 11:15:44 +01:00 • committed by Roman Tsisyk
parent 37b173d291
commit 6c65e90080
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
android/app/build.gradle
View file

@ -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'
}

4
android/build.gradle
View file

@ -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
}