From 9398f4db03a5086038ea806eaa9d221e161cf52b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 19 Oct 2020 09:58:14 +0100
Subject: [PATCH] Fix ABR tests gradle build.

The build needs to remove some duplicate dependencies to work again.

Also replace a deprecated API usage with the non-deprecated equivalent
and merge the two Blaze target into one to simplify Gradle file.

PiperOrigin-RevId: 337812099
---
 constants.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/constants.gradle b/constants.gradle
index 0625fbd3b7..3a58ceee76 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -35,10 +35,11 @@ project.ext {
     androidxMediaVersion = '1.0.1'
     androidxMultidexVersion = '2.0.0'
     androidxRecyclerViewVersion = '1.1.0'
-    androidxTestCoreVersion = '1.2.0'
+    androidxTestCoreVersion = '1.3.0'
     androidxTestJUnitVersion = '1.1.1'
-    androidxTestRunnerVersion = '1.2.0'
-    androidxTestRulesVersion = '1.2.0'
+    androidxTestRunnerVersion = '1.3.0'
+    androidxTestRulesVersion = '1.3.0'
+    androidxTestServicesStorageVersion = '1.3.0'
     truthVersion = '1.0'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {