diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /mobile/android/geckoview/build.gradle | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mobile/android/geckoview/build.gradle')
| -rw-r--r-- | mobile/android/geckoview/build.gradle | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle index 6e5826655d..040cd2fea8 100644 --- a/mobile/android/geckoview/build.gradle +++ b/mobile/android/geckoview/build.gradle @@ -24,7 +24,6 @@ android { targetSdkVersion project.ext.targetSdkVersion minSdkVersion project.ext.minSdkVersion manifestPlaceholders = project.ext.manifestPlaceholders - multiDexEnabled true versionCode project.ext.versionCode versionName project.ext.versionName @@ -229,34 +228,28 @@ configurations { } dependencies { - implementation "androidx.annotation:annotation:1.6.0" - implementation "androidx.legacy:legacy-support-v4:1.0.0" + implementation ComponentsDependencies.androidx_annotation implementation "com.google.android.gms:play-services-fido:20.0.1" implementation "org.yaml:snakeyaml:2.2" - implementation "androidx.lifecycle:lifecycle-common:2.6.1" - implementation "androidx.lifecycle:lifecycle-process:2.6.1" + implementation ComponentsDependencies.androidx_lifecycle_common + implementation ComponentsDependencies.androidx_lifecycle_process if (mozconfig.substs.MOZ_ANDROID_HLS_SUPPORT) { implementation project(":exoplayer2") } - testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testImplementation 'junit:junit:4.13.2' - testImplementation 'org.robolectric:robolectric:4.10.1' - testImplementation 'org.mockito:mockito-core:5.3.1' + testImplementation ComponentsDependencies.testing_junit + testImplementation ComponentsDependencies.testing_robolectric - androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1" - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + androidTestImplementation ComponentsDependencies.testing_coroutines + androidTestImplementation ComponentsDependencies.androidx_test_runner + androidTestImplementation ComponentsDependencies.androidx_test_rules + androidTestImplementation ComponentsDependencies.androidx_test_junit + androidTestImplementation ComponentsDependencies.androidx_espresso_core androidTestImplementation 'com.koushikdutta.async:androidasync:3.1.0' - - androidTestImplementation 'androidx.multidex:multidex:2.0.1' } apply from: "${topsrcdir}/mobile/android/gradle/with_gecko_binaries.gradle" |