From f560ec8e8d943430fb75672d926f35c0eba79f7b Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Tue, 23 Apr 2019 13:09:28 -0700 Subject: [PATCH] Closes #1902: Remove direct appservices dependencies Our main dependency - android-components - is tightly integrated against a certain version of appservices. Having a direct dependency at the Fenix level is a foot-gun: it allows Fenix to consume an API-incompatible version of appservices, breaking parts of android-components. Due to how gradle dependency resolution works, this breakage is "silent": there are no compile time warnings. A recent example of this is broken history sync, and buggy FxA experience in Fenix. This patch removes a direct dependency, letting android-components dictate which appservices version should be used Fenix builds. --- app/build.gradle | 2 -- buildSrc/src/main/java/Dependencies.kt | 3 --- 2 files changed, 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 72dd716e1..798b7e35d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -255,8 +255,6 @@ dependencies { implementation Deps.leanplum - implementation Deps.mozilla_places - implementation Deps.mozilla_concept_engine implementation Deps.mozilla_concept_storage implementation Deps.mozilla_concept_toolbar diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index a399f49ce..087687870 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -26,7 +26,6 @@ private object Versions { const val appservices_gradle_plugin = "0.4.4" const val mozilla_android_components = "0.51.0-SNAPSHOT" - const val mozilla_appservices = "0.26.0" const val autodispose = "1.1.0" const val adjust = "4.11.4" @@ -103,8 +102,6 @@ object Deps { const val mozilla_feature_session_bundling = "org.mozilla.components:feature-session-bundling:${Versions.mozilla_android_components}" const val mozilla_feature_site_permissions = "org.mozilla.components:feature-sitepermissions:${Versions.mozilla_android_components}" - const val mozilla_places = "org.mozilla.appservices:places:${Versions.mozilla_appservices}" - const val mozilla_service_firefox_accounts = "org.mozilla.components:service-firefox-accounts:${Versions.mozilla_android_components}" const val mozilla_service_fretboard = "org.mozilla.components:service-fretboard:${Versions.mozilla_android_components}" const val mozilla_service_glean = "org.mozilla.components:service-glean:${Versions.mozilla_android_components}"