Skip to content

Commit

Permalink
Bug 1938574 - Fix Unit tests that depend on the app-services megazord…
Browse files Browse the repository at this point in the history
…, r=RyanVM

The new package name is going to be `full-megazord-libsForTest`
(mozilla/application-services#6533).

Differential Revision: https://phabricator.services.mozilla.com/D232720
  • Loading branch information
bendk committed Dec 20, 2024
1 parent 9593f45 commit efaa2dd
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion mobile/android/fenix/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down

0 comments on commit efaa2dd

Please sign in to comment.