Merge pull request #2565 from mozilla/fenix-full-mz

Move fenix to the full megazord. Fixes #1466 [ci full]

.buildconfig-android.yml

@@ -91,13 +91,3 @@ projects:
       - name: full-megazord-forUnitTests
         type: jar
     description: Megazord containing all features
-  fenix-megazord:
-    uploadSymbols: true
-    path: megazords/fenix/android
-    artifactId: fenix-megazord
-    publications:
-      - name: fenix-megazord
-        type: aar
-      - name: fenix-megazord-forUnitTests
-        type: jar
-    description: Megazord of [fxaclient, places, push, logging].

.circleci/config.yml

@@ -164,8 +164,6 @@ commands:
             python3 ./tools/dependency_summary.py --all-ios-targets --package megazord_ios --check megazords/ios/DEPENDENCIES.md
             python3 ./tools/dependency_summary.py --all-android-targets --package megazord --check megazords/full/DEPENDENCIES.md
             python3 ./tools/dependency_summary.py --all-android-targets --package megazord --format pom --check megazords/full/android/dependency-licenses.xml
-            python3 ./tools/dependency_summary.py --all-android-targets --package fenix --check megazords/fenix/DEPENDENCIES.md
-            python3 ./tools/dependency_summary.py --all-android-targets --package fenix --format pom --check megazords/fenix/android/dependency-licenses.xml
             python3 ./tools/dependency_summary.py --all-android-targets --package lockbox --check megazords/lockbox/DEPENDENCIES.md
             python3 ./tools/dependency_summary.py --all-android-targets --package lockbox --format pom --check megazords/lockbox/android/dependency-licenses.xml
 

CHANGES_UNRELEASED.md

@@ -4,6 +4,20 @@
 
 [Full Changelog](https://github.com/mozilla/application-services/compare/v0.52.0...master)
 
+## Megazords
+
+### What's changed
+
+- The fenix megazord is no more! ([#2565](https://github.com/mozilla/application-services/pull/2565))
+
+  The full megazord should be used instead. The two are functionally identical,
+  however this should reduce the configuration surface required to use the
+  application-services code.
+
+  An example PR showing the changes typically required for this is available
+  here: https://github.com/MozillaReality/FirefoxReality/pull/2867. Please feel
+  free to reach out if you have any issues.
+
 ## Sync
 
 ### What's fixed

Cargo.toml

@@ -28,7 +28,6 @@ members = [
     "components/tabs",
     "components/tabs/ffi",
     "components/viaduct",
-    "megazords/fenix",
     "megazords/full",
     "megazords/ios/rust",
     "megazords/lockbox",

docs/product-portal/applications/consuming-megazord-libraries.md

@@ -89,7 +89,6 @@ to fit the needs of existing Firefox applications:
 | Name | Components | Maven publication |
 | --- | --- | --- |
 | `lockbox` | `fxaclient`, `logins` | `org.mozilla.appservices:lockbox-megazord` |
-| `fenix` | `fxaclient`, `logins`, `places` | `org.mozilla.appservices:fenix-megazord` |
 
 Then, simply use gradle's builtin support for [module replacement](https://docs.gradle.org/current/userguide/customizing_dependency_resolution_behavior.html#sec:module_replacement)
 to replace the default "full megazord" with your selected custom build:
@@ -98,7 +97,7 @@ to replace the default "full megazord" with your selected custom build:
 dependencies {
   modules {
     module('org.mozilla.appservices:full-megazord') {
-      replacedBy('org.mozilla.appservices:fenix-megazord', 'prefer the fenix megazord, to reduce final application size')
+      replacedBy('org.mozilla.appservices:lockbox-megazord', 'prefer the lockbox megazord, to reduce final application size')
     }
   }
 }
@@ -126,7 +125,7 @@ Or, if you are using a custom megazord library, like this:
 
 ```groovy
 dependencies {
-  testImplementation "org.mozilla.appservices:fenix-megazord-forUnitTests:X.Y.Z"
+  testImplementation "org.mozilla.appservices:lockbox-megazord-forUnitTests:X.Y.Z"
 }
 ```