Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Feb 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .buildconfig-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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].
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 14 additions & 0 deletions CHANGES_UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ members = [
"components/tabs",
"components/tabs/ffi",
"components/viaduct",
"megazords/fenix",
"megazords/full",
"megazords/ios/rust",
"megazords/lockbox",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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')
}
}
}
Expand Down Expand Up @@ -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"
}
```

Expand Down
18 changes: 0 additions & 18 deletions megazords/fenix/Cargo.toml

This file was deleted.

Loading