Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1914294 - Migrate AndroidX Benchmark to the AC dependencies plugin. r=android-reviewers,mcarare

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D219828
This commit is contained in:
Ryan VanderMeulen 2024-08-22 13:08:38 +00:00
parent c83557f0f9
commit b89ce31274
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -34,7 +34,7 @@ buildscript {
// Used in mobile/android/fenix/app/build.gradle
classpath ComponentsDependencies.androidx_safeargs
classpath FenixDependencies.osslicenses_plugin
classpath FenixDependencies.tools_benchmarkgradle
classpath ComponentsDependencies.tools_benchmarkgradle
classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
classpath "${ApplicationServicesConfig.groupId}:tooling-nimbus-gradle:${ApplicationServicesConfig.version}"
}

4
mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
View File

@ -58,6 +58,7 @@ object Versions {
const val annotation = "1.8.2"
const val appcompat = "1.7.0"
const val autofill = "1.1.0"
const val benchmark = "1.2.4"
const val browser = "1.8.0"
const val biometric = "1.1.0"
const val cardview = "1.0.0"
@ -126,6 +127,8 @@ object ComponentsDependencies {
const val androidx_autofill = "androidx.autofill:autofill:${Versions.AndroidX.autofill}"
const val androidx_arch_core_common = "androidx.arch.core:core-common:${Versions.AndroidX.arch}"
const val androidx_arch_core_testing = "androidx.arch.core:core-testing:${Versions.AndroidX.arch}"
const val androidx_benchmark_junit4 = "androidx.benchmark:benchmark-junit4:${Versions.AndroidX.benchmark}"
const val androidx_benchmark_macro_junit4 = "androidx.benchmark:benchmark-macro-junit4:${Versions.AndroidX.benchmark}"
const val androidx_biometric = "androidx.biometric:biometric:${Versions.AndroidX.biometric}"
const val androidx_browser = "androidx.browser:browser:${Versions.AndroidX.browser}"
const val androidx_cardview = "androidx.cardview:cardview:${Versions.AndroidX.cardview}"
@ -198,6 +201,7 @@ object ComponentsDependencies {
const val leakcanary = "com.squareup.leakcanary:leakcanary-android:${Versions.leakcanary}"
const val tools_androidgradle = "com.android.tools.build:gradle:${Versions.android_gradle_plugin}"
const val tools_benchmarkgradle = "androidx.benchmark:benchmark-gradle-plugin:${Versions.AndroidX.benchmark}"
const val tools_kotlingradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
const val tools_lint = "com.android.tools.lint:lint:${Versions.lint}"

2
mobile/android/fenix/app/build.gradle
View File

@ -744,9 +744,9 @@ dependencies {
androidTestImplementation ComponentsDependencies.androidx_test_uiautomator
androidTestUtil ComponentsDependencies.androidx_test_orchestrator
androidTestImplementation ComponentsDependencies.androidx_benchmark_junit4
androidTestImplementation ComponentsDependencies.androidx_compose_ui_test
androidTestImplementation ComponentsDependencies.androidx_work_testing
androidTestImplementation FenixDependencies.androidx_benchmark_junit4
androidTestImplementation ComponentsDependencies.testing_mockwebserver
testImplementation project(':support-test')
testImplementation project(':support-test-libstate')

2
mobile/android/fenix/benchmark/build.gradle
View File

@ -65,7 +65,7 @@ dependencies {
implementation ComponentsDependencies.androidx_test_junit
implementation ComponentsDependencies.androidx_espresso_core
implementation ComponentsDependencies.androidx_test_uiautomator
implementation FenixDependencies.androidx_benchmark_macro_junit4
implementation ComponentsDependencies.androidx_benchmark_macro_junit4
}
androidComponents {

2
mobile/android/fenix/build.gradle
View File

@ -22,8 +22,8 @@ buildscript {
dependencies {
classpath ComponentsDependencies.tools_androidgradle
classpath ComponentsDependencies.tools_benchmarkgradle
classpath ComponentsDependencies.tools_kotlingradle
classpath FenixDependencies.tools_benchmarkgradle
classpath ComponentsDependencies.androidx_safeargs
classpath FenixDependencies.osslicenses_plugin
classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"

5
mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
View File

@ -18,7 +18,6 @@ object FenixVersions {
const val falcon = "2.2.0"
const val fastlane = "2.1.1"
const val androidx_benchmark = "1.2.4"
const val androidx_profileinstaller = "1.3.1"
const val androidx_splash_screen = "1.0.1"
const val androidx_viewpager2 = "1.1.0"
@ -37,12 +36,8 @@ object FenixVersions {
@Suppress("unused")
object FenixDependencies {
const val tools_benchmarkgradle = "androidx.benchmark:benchmark-gradle-plugin:${FenixVersions.androidx_benchmark}"
const val osslicenses_plugin = "com.google.android.gms:oss-licenses-plugin:${FenixVersions.osslicenses_plugin}"
const val androidx_benchmark_junit4 = "androidx.benchmark:benchmark-junit4:${FenixVersions.androidx_benchmark}"
const val androidx_benchmark_macro_junit4 = "androidx.benchmark:benchmark-macro-junit4:${FenixVersions.androidx_benchmark}"
const val androidx_core_splashscreen = "androidx.core:core-splashscreen:${FenixVersions.androidx_splash_screen}"
const val androidx_profileinstaller = "androidx.profileinstaller:profileinstaller:${FenixVersions.androidx_profileinstaller}"
const val androidx_viewpager2 = "androidx.viewpager2:viewpager2:${FenixVersions.androidx_viewpager2}"