From 7bf98b9fc2b6b1d5fac46aec8c8b961487e02ec9 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 8 Jun 2018 00:38:16 -0700
Subject: [PATCH] Update forced dependencies to fix release

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=199758072
---
 extensions/cast/build.gradle | 20 +++++++++-----------
 extensions/ima/build.gradle  | 15 +++++++--------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index 8374910879..fa348aaf17 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -26,17 +26,6 @@ android {
 }
 
 dependencies {
-    // These dependencies are necessary to force the supportLibraryVersion of
-    // com.android.support:support-v4, com.android.support:appcompat-v7 and
-    // com.android.support:mediarouter-v7 to be used. Else older versions are
-    // used, for example:
-    // com.google.android.gms:play-services-cast-framework:15.0.1
-    // |-- com.google.android.gms:play-services-base:15.0.1
-    //   |-- com.google.android.gms:play-services-basement:15.0.1
-    //     |-- com.android.support:support-v4:26.1.0
-    api 'com.android.support:support-v4:' + supportLibraryVersion
-    api 'com.android.support:appcompat-v7:' + supportLibraryVersion
-    api 'com.android.support:mediarouter-v7:' + supportLibraryVersion
     api 'com.google.android.gms:play-services-cast-framework:' + playServicesLibraryVersion
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-ui')
@@ -45,6 +34,15 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:' + mockitoVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
+    // These dependencies are necessary to force the supportLibraryVersion of
+    // com.android.support:support-v4, com.android.support:appcompat-v7 and
+    // com.android.support:mediarouter-v7 to be used. Else older versions are
+    // used, for example via:
+    // com.google.android.gms:play-services-cast-framework:15.0.1
+    // |-- com.android.support:mediarouter-v7:26.1.0
+    api 'com.android.support:support-v4:' + supportLibraryVersion
+    api 'com.android.support:mediarouter-v7:' + supportLibraryVersion
+    api 'com.android.support:recyclerview-v7:' + supportLibraryVersion
 }
 
 ext {
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index 4403095658..cec6b8a495 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -26,17 +26,16 @@ android {
 }
 
 dependencies {
-    // This dependency is necessary to force the supportLibraryVersion of
-    // com.android.support:support-v4 to be used. Else an older version is
-    // included via:
-    // com.google.android.gms:play-services-ads:15.0.1
-    // |-- com.google.android.gms:play-services-ads-identifier:15.0.1
-    //   |-- com.google.android.gms:play-services-basement:15.0.1
-    //     |-- com.android.support:support-v4:26.1.0
-    api 'com.android.support:support-v4:' + supportLibraryVersion
     api 'com.google.ads.interactivemedia.v3:interactivemedia:3.8.7'
     implementation project(modulePrefix + 'library-core')
     implementation 'com.google.android.gms:play-services-ads:' + playServicesLibraryVersion
+    // These dependencies are necessary to force the supportLibraryVersion of
+    // com.android.support:support-v4 and com.android.support:customtabs to be
+    // used. Else older versions are used, for example via:
+    // com.google.android.gms:play-services-ads:15.0.1
+    // |-- com.android.support:customtabs:26.1.0
+    implementation 'com.android.support:support-v4:' + supportLibraryVersion
+    implementation 'com.android.support:customtabs:' + supportLibraryVersion
 }
 
 ext {