Backed out changeset 1499c0543d3c (bug 1524529)
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 11 Feb 2019 17:46:10 -0500
changeset 509646 902792acd2a5
parent 509645 ebce547ba39c
child 509647 b6b545883295
push id1938
push userryanvm@gmail.com
push dateMon, 11 Feb 2019 23:33:35 +0000
treeherdermozilla-release@1ea7b51ef5bb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1524529
milestone65.0.1
backs out1499c0543d3c
Backed out changeset 1499c0543d3c (bug 1524529)
build.gradle
mobile/android/app/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -47,17 +47,16 @@ buildscript {
     }
 
     ext.kotlin_version = '1.2.41'
     ext.support_library_version = '26.1.0'
     ext.jacoco_version = '0.8.1'
 
     if (gradle.mozconfig.substs.MOZ_ANDROID_GOOGLE_PLAY_SERVICES) {
         ext.google_play_services_version = '15.0.1'
-        ext.google_play_services_cast_version = '16.0.0'
     }
 
     dependencies {
         classpath 'org.mozilla.apilint:apilint:0.1.4'
         classpath 'com.android.tools.build:gradle:3.1.4'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -219,17 +219,17 @@ dependencies {
     // We could conditionally include support, but we'd need
     // to generate the `Application` class or fork the file on disk.
     implementation "com.android.support:multidex:1.0.3"
 
     if (mozconfig.substs.MOZ_NATIVE_DEVICES) {
         implementation "com.android.support:mediarouter-v7:$support_library_version"
         implementation "com.google.android.gms:play-services-basement:$google_play_services_version"
         implementation "com.google.android.gms:play-services-base:$google_play_services_version"
-        implementation "com.google.android.gms:play-services-cast:$google_play_services_cast_version"
+        implementation "com.google.android.gms:play-services-cast:$google_play_services_version"
     }
 
     if (mozconfig.substs.MOZ_INSTALL_TRACKING) {
         implementation "com.google.android.gms:play-services-ads-identifier:$google_play_services_version"
         implementation "com.google.android.gms:play-services-basement:$google_play_services_version"
     }
 
     if (mozconfig.substs.MOZ_ANDROID_GCM) {
@@ -452,25 +452,23 @@ android.applicationVariants.all configur
 
 // Bug 1320310 - Hack up the manifest produced by Gradle to match that produced
 // by moz.build.  Per https://bugzilla.mozilla.org/show_bug.cgi?id=1320310#c14,
 // this breaks launching in Android Studio; therefore, we only do this for
 // official automation builds and not for local developer builds.
 import groovy.xml.XmlUtil
 
 // Workaround for fixing sub-dependencies upon gradle error:
-// All gms/firebase (except play-services-cast since it has sub-dependencies in 15.0.0)
-// libraries must use the exact same version specification (mixing versions can
+// All gms/firebase libraries must use the exact same version specification (mixing versions can
 // lead to runtime crashes). Found versions 15.0.1, 15.0.0. Examples include
-// com.google.android.gms:play-services-base:15.0.1 and com.google.android.gms:play-services-basement:15.0.0
+// com.google.android.gms:play-services-base:15.0.1 and com.google.android.gms:play-services-cast:15.0.0
 configurations.all {
     resolutionStrategy {
         eachDependency { DependencyResolveDetails details ->
-            if (details.requested.group == 'com.google.android.gms'
-                    && details.requested.name != 'play-services-cast') {
+            if (details.requested.group == 'com.google.android.gms') {
                 details.useVersion "$google_play_services_version"
             }
         }
     }
 }
 
 android.applicationVariants.all { variant ->
     if (!mozconfig.substs.MOZILLA_OFFICIAL) {