mirror of
https://github.com/fork-maintainers/iceraven-browser
synced 2024-11-11 13:11:01 +00:00
Bug 1818826 - Remove Android Component Nimbus gradle plugin wrapper
This commit is contained in:
parent
393c31755e
commit
b26e07c5f2
@ -433,14 +433,12 @@ android.applicationVariants.all { variant ->
|
|||||||
|
|
||||||
// Generate Kotlin code for the Fenix Glean metrics.
|
// Generate Kotlin code for the Fenix Glean metrics.
|
||||||
apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
|
apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
|
||||||
apply plugin: "org.mozilla.components.nimbus-gradle-plugin"
|
apply plugin: "org.mozilla.appservices.nimbus-gradle-plugin"
|
||||||
|
|
||||||
nimbus {
|
nimbus {
|
||||||
// The path to the Nimbus feature manifest file
|
// The path to the Nimbus feature manifest file
|
||||||
manifestFile = "nimbus.fml.yaml"
|
manifestFile = "nimbus.fml.yaml"
|
||||||
// The fully qualified class name for the generated features.
|
// The fully qualified class name for the generated features.
|
||||||
// If the classname begins with a '.' this is taken as a suffix to the app's package name
|
|
||||||
destinationClass = ".nimbus.FxNimbus"
|
|
||||||
// Map from the variant name to the channel as experimenter and nimbus understand it.
|
// Map from the variant name to the channel as experimenter and nimbus understand it.
|
||||||
// If nimbus's channels were accurately set up well for this project, then this
|
// If nimbus's channels were accurately set up well for this project, then this
|
||||||
// shouldn't be needed.
|
// shouldn't be needed.
|
||||||
@ -455,6 +453,7 @@ nimbus {
|
|||||||
// and used to inform experiment configuration.
|
// and used to inform experiment configuration.
|
||||||
experimenterManifest = ".experimenter.yaml"
|
experimenterManifest = ".experimenter.yaml"
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
// There's an interaction between Gradle's resolution of dependencies with different types
|
// There's an interaction between Gradle's resolution of dependencies with different types
|
||||||
// (@jar, @aar) for `implementation` and `testImplementation` and with Android Studio's built-in
|
// (@jar, @aar) for `implementation` and `testImplementation` and with Android Studio's built-in
|
||||||
|
@ -10,7 +10,7 @@ channels:
|
|||||||
- nightly
|
- nightly
|
||||||
- developer
|
- developer
|
||||||
includes:
|
includes:
|
||||||
- ./messaging.fml.yaml
|
- messaging.fml.yaml
|
||||||
features:
|
features:
|
||||||
homescreen:
|
homescreen:
|
||||||
description: The homescreen that the user goes to when they press home or new tab.
|
description: The homescreen that the user goes to when they press home or new tab.
|
15
build.gradle
15
build.gradle
@ -65,20 +65,7 @@ buildscript {
|
|||||||
classpath FenixDependencies.androidx_safeargs
|
classpath FenixDependencies.androidx_safeargs
|
||||||
classpath FenixDependencies.osslicenses_plugin
|
classpath FenixDependencies.osslicenses_plugin
|
||||||
classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
|
classpath "org.mozilla.telemetry:glean-gradle-plugin:${Versions.mozilla_glean}"
|
||||||
// NOTE: The Nimbus plugin needs to be refactored into a top-level plugin
|
classpath "org.mozilla.appservices:tooling-nimbus-gradle:${Versions.mozilla_appservices}"
|
||||||
// and consumed via includeBuild (using composite builds). This is a short-term
|
|
||||||
// workaround to consume the latest version of the Nimbus plugin matching the Focus version.
|
|
||||||
if (Config.readVersionFromFile().contains("a")) {
|
|
||||||
// Use the latest version of the plugin on the main branch (nightly).
|
|
||||||
classpath("org.mozilla.components:tooling-nimbus-gradle:latest.release")
|
|
||||||
} else {
|
|
||||||
// Use the latest version matching the major version of the branch (beta/release).
|
|
||||||
classpath("org.mozilla.components:tooling-nimbus-gradle") {
|
|
||||||
version {
|
|
||||||
strictly("${Config.majorVersion()}.+")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
Loading…
Reference in New Issue
Block a user