From fc85c45d43ad9845a6e390df7db85dd490928e73 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Wed, 1 Jan 2025 01:52:01 +0000 Subject: [PATCH] Bug 1938574 - Fix Unit tests that depend on the app-services megazord, r=RyanVM The new package name is going to be `full-megazord-libsForTest` (https://github.com/mozilla/application-services/pull/6533). Differential Revision: https://phabricator.services.mozilla.com/D232720 UltraBlame original commit: 8c693fe9f2ce5d5b3a11625224f09e01e110caad --- .../components/browser/storage-sync/build.gradle | 2 +- .../android-components/components/feature/accounts/build.gradle | 2 +- .../components/feature/fxsuggest/build.gradle | 2 +- .../components/service/firefox-accounts/build.gradle | 2 +- .../android-components/components/service/nimbus/build.gradle | 2 +- .../components/service/sync-autofill/build.gradle | 2 +- .../android-components/components/support/rustlog/build.gradle | 2 +- .../components/support/test-appservices/build.gradle | 2 +- .../plugins/dependencies/src/main/java/DependenciesPlugin.kt | 2 +- mobile/android/fenix/app/build.gradle | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mobile/android/android-components/components/browser/storage-sync/build.gradle b/mobile/android/android-components/components/browser/storage-sync/build.gradle index 901e2abbb0dcb..d6a30c1d48bb4 100644 --- a/mobile/android/android-components/components/browser/storage-sync/build.gradle +++ b/mobile/android/android-components/components/browser/storage-sync/build.gradle @@ -55,7 +55,7 @@ dependencies { testImplementation ComponentsDependencies.mozilla_appservices_tabs testImplementation ComponentsDependencies.testing_mockwebserver - testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_forUnitTests + testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_libsForTests testImplementation ComponentsDependencies.mozilla_glean_forUnitTests } diff --git a/mobile/android/android-components/components/feature/accounts/build.gradle b/mobile/android/android-components/components/feature/accounts/build.gradle index 8f7b05ce40a31..e649a5d9a2863 100644 --- a/mobile/android/android-components/components/feature/accounts/build.gradle +++ b/mobile/android/android-components/components/feature/accounts/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation project(':support-webextensions') testImplementation ComponentsDependencies.androidx_test_junit - testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_forUnitTests + testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_libsForTests testImplementation ComponentsDependencies.testing_robolectric testImplementation ComponentsDependencies.testing_coroutines diff --git a/mobile/android/android-components/components/feature/fxsuggest/build.gradle b/mobile/android/android-components/components/feature/fxsuggest/build.gradle index f43743be1f46b..d5b717c0eff53 100644 --- a/mobile/android/android-components/components/feature/fxsuggest/build.gradle +++ b/mobile/android/android-components/components/feature/fxsuggest/build.gradle @@ -62,7 +62,7 @@ dependencies { testImplementation ComponentsDependencies.androidx_test_core testImplementation ComponentsDependencies.androidx_test_junit testImplementation ComponentsDependencies.androidx_work_testing - testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_forUnitTests + testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_libsForTests testImplementation ComponentsDependencies.testing_coroutines testImplementation ComponentsDependencies.testing_robolectric } diff --git a/mobile/android/android-components/components/service/firefox-accounts/build.gradle b/mobile/android/android-components/components/service/firefox-accounts/build.gradle index d56488fed1c93..19c1ca3f295c6 100644 --- a/mobile/android/android-components/components/service/firefox-accounts/build.gradle +++ b/mobile/android/android-components/components/service/firefox-accounts/build.gradle @@ -57,7 +57,7 @@ dependencies { testImplementation ComponentsDependencies.testing_robolectric testImplementation ComponentsDependencies.testing_coroutines - testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_forUnitTests + testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_libsForTests testImplementation ComponentsDependencies.kotlin_reflect } diff --git a/mobile/android/android-components/components/service/nimbus/build.gradle b/mobile/android/android-components/components/service/nimbus/build.gradle index a5e91d3ba6226..211f7901f1a07 100644 --- a/mobile/android/android-components/components/service/nimbus/build.gradle +++ b/mobile/android/android-components/components/service/nimbus/build.gradle @@ -81,7 +81,7 @@ dependencies { // send crash reports to Socorro (GV). compileOnly ComponentsDependencies.mozilla_glean - testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_forUnitTests + testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_libsForTests testImplementation ComponentsDependencies.androidx_test_core testImplementation ComponentsDependencies.androidx_test_junit testImplementation ComponentsDependencies.testing_mockwebserver diff --git a/mobile/android/android-components/components/service/sync-autofill/build.gradle b/mobile/android/android-components/components/service/sync-autofill/build.gradle index 7fa9d4960540e..1438336b8dfc4 100644 --- a/mobile/android/android-components/components/service/sync-autofill/build.gradle +++ b/mobile/android/android-components/components/service/sync-autofill/build.gradle @@ -41,7 +41,7 @@ dependencies { testImplementation ComponentsDependencies.androidx_test_junit testImplementation ComponentsDependencies.testing_robolectric testImplementation ComponentsDependencies.testing_coroutines - testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_forUnitTests + testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_libsForTests } apply from: '../../../android-lint.gradle' diff --git a/mobile/android/android-components/components/support/rustlog/build.gradle b/mobile/android/android-components/components/support/rustlog/build.gradle index 3b5667d1ce12a..ff48b681e98d7 100644 --- a/mobile/android/android-components/components/support/rustlog/build.gradle +++ b/mobile/android/android-components/components/support/rustlog/build.gradle @@ -38,7 +38,7 @@ dependencies { testImplementation ComponentsDependencies.mozilla_appservices_rust_log_forwarder testImplementation project(':support-test') - testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_forUnitTests + testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_libsForTests testImplementation ComponentsDependencies.junit_vintage testImplementation ComponentsDependencies.androidx_test_junit diff --git a/mobile/android/android-components/components/support/test-appservices/build.gradle b/mobile/android/android-components/components/support/test-appservices/build.gradle index 8e64b7453656b..dea74f9ebdc53 100644 --- a/mobile/android/android-components/components/support/test-appservices/build.gradle +++ b/mobile/android/android-components/components/support/test-appservices/build.gradle @@ -28,7 +28,7 @@ android { } dependencies { - api ComponentsDependencies.mozilla_appservices_full_megazord_forUnitTests + api ComponentsDependencies.mozilla_appservices_full_megazord_libsForTests } apply from: '../../../android-lint.gradle' diff --git a/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt b/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt index d7a653d78df01..b2b68a913abc5 100644 --- a/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt +++ b/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt @@ -255,7 +255,7 @@ object ComponentsDependencies { val mozilla_appservices_suggest = "${ApplicationServicesConfig.groupId}:suggest:${ApplicationServicesConfig.version}" val mozilla_appservices_httpconfig = "${ApplicationServicesConfig.groupId}:httpconfig:${ApplicationServicesConfig.version}" val mozilla_appservices_full_megazord = "${ApplicationServicesConfig.groupId}:full-megazord:${ApplicationServicesConfig.version}" - val mozilla_appservices_full_megazord_forUnitTests = "${ApplicationServicesConfig.groupId}:full-megazord-forUnitTests:${ApplicationServicesConfig.version}" + val mozilla_appservices_full_megazord_libsForTests = "${ApplicationServicesConfig.groupId}:full-megazord-libsForTests:${ApplicationServicesConfig.version}" val mozilla_appservices_errorsupport = "${ApplicationServicesConfig.groupId}:errorsupport:${ApplicationServicesConfig.version}" val mozilla_appservices_rust_log_forwarder = "${ApplicationServicesConfig.groupId}:rust-log-forwarder:${ApplicationServicesConfig.version}" diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle index f92d68875e49d..a63fa8a5b830e 100644 --- a/mobile/android/fenix/app/build.gradle +++ b/mobile/android/fenix/app/build.gradle @@ -742,7 +742,7 @@ dependencies { testImplementation project(':support-test-libstate') testImplementation ComponentsDependencies.androidx_test_junit testImplementation ComponentsDependencies.androidx_work_testing - testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_forUnitTests + testImplementation ComponentsDependencies.mozilla_appservices_full_megazord_libsForTests testImplementation (ComponentsDependencies.testing_robolectric) { exclude group: 'org.apache.maven' }