From 7635874388e821c6a94a4998244838ad6dcb6148 Mon Sep 17 00:00:00 2001
From: Florian Dreier <dreier.florian@gmail.com>
Date: Sun, 28 Jul 2019 18:47:30 +0200
Subject: [PATCH] Next try

---
 app/build.gradle    | 7 ++++---
 dependencies.gradle | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9363f95e0..4b9d3b784 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,6 +241,7 @@ dependencies {
     androidTestImplementation dependencies.androidxTestCore
     androidTestImplementation dependencies.runner
     androidTestImplementation dependencies.rules
+    androidTestUtil dependencies.androidTestOrchestrator
     androidTestImplementation dependencies.uiAutomator
     androidTestImplementation dependencies.espressoCore
     androidTestImplementation dependencies.espressoContrib
@@ -253,11 +254,11 @@ dependencies {
 
     implementation dependencies.multiDex
 
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestUtil 'androidx.test:orchestrator:1.1.0'
 }
 
-project.configurations.all {
+configurations.all {
+    exclude module: 'httpclient'
+    exclude module: 'commons-logging'
     resolutionStrategy.eachDependency { details ->
         if (details.requested.group == 'com.google.guava' && details.requested.name == 'guava') {
             details.useVersion '27.0.1-android'
diff --git a/dependencies.gradle b/dependencies.gradle
index 2c227d73e..03685ba3a 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -68,6 +68,7 @@ ext {
             androidxTestCore              : 'androidx.test:core:1.0.0',
             androidxTestExt               : 'androidx.test.ext:junit:1.1.1',
             androidxTestTruth             : 'androidx.test.ext:truth:1.2.0',
+            androidTestOrchestrator       : 'androidx.test:orchestrator:1.1.0',
 
             supportDesign                 : 'com.android.support:design:28.0.0',