From 2ccd681d2f4c1147f3d773875c7b4c09e7d3e101 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 30 Apr 2018 10:16:37 +0200
Subject: [PATCH] Fix merge dex error and delete redundant dependencies

---
 gradle/wrapper/gradle-wrapper.properties               | 2 +-
 sample_client/build.gradle                             | 5 -----
 sample_client/gradle/wrapper/gradle-wrapper.properties | 2 +-
 test_client/build.gradle                               | 6 ------
 test_client/gradle/wrapper/gradle-wrapper.properties   | 2 +-
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 75622d3e..267dfc1e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index c1bd54a1..c0f96865 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -42,9 +42,4 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
-    android {
-        lintOptions {
-            abortOnError false
-        }
-    }
 }
diff --git a/sample_client/gradle/wrapper/gradle-wrapper.properties b/sample_client/gradle/wrapper/gradle-wrapper.properties
index 122a0dca..fc5d4423 100644
--- a/sample_client/gradle/wrapper/gradle-wrapper.properties
+++ b/sample_client/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file
diff --git a/test_client/build.gradle b/test_client/build.gradle
index c3f020a0..8d01b841 100644
--- a/test_client/build.gradle
+++ b/test_client/build.gradle
@@ -6,7 +6,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'commons-httpclient:commons-httpclient:3.1'
     implementation project(':')
 }
 
@@ -44,9 +43,4 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
-    android {
-        lintOptions {
-            abortOnError false
-        }
-    }
 }
diff --git a/test_client/gradle/wrapper/gradle-wrapper.properties b/test_client/gradle/wrapper/gradle-wrapper.properties
index 122a0dca..fc5d4423 100644
--- a/test_client/gradle/wrapper/gradle-wrapper.properties
+++ b/test_client/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file