From 5e2e1103b88475eb000b650533c2dc726988f1df Mon Sep 17 00:00:00 2001
From: Armel S <armel@rm3l.org>
Date: Sat, 3 Mar 2018 23:02:23 +0100
Subject: [PATCH] Upgrade dependencies versions: maoni-common => 6.0.0

---
 build.gradle                             | 29 ++++++++----------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b20c9a..091a862 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,10 +24,11 @@ final homePath = System.properties['user.home']
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha04'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -37,6 +38,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
@@ -47,28 +49,17 @@ apply plugin: 'com.github.dcendents.android-maven'
 targetCompatibility = '1.7'
 sourceCompatibility = '1.7'
 
-/*
- * This is to mark some artifacts (such as Android's) as provided
- * so that we don't get dependency conflicts
- */
-configurations {
-    provided
-    compile.extendsFrom provided
-}
-
 group = 'org.rm3l'
 version = '3.0.0-1'
 
 dependencies {
-    compile 'org.rm3l:maoni-common:3.0.0'
+    implementation 'org.rm3l:maoni-common:6.0.0'
     //We are interacting with Android components for sending emails
-    provided 'com.google.android:android:4.1.1.4'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
+    compileOnly ('com.google.android:android:4.1.1.4') {
+        exclude group: 'org.json', module: 'json'
+    }
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
 }
 
 task generateSourcesJar(type: Jar) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ed5c142..15e9dc1 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-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip