From ea4cd3a2a5f90762fc529a3d3fd2d2fbcd0d9cc4 Mon Sep 17 00:00:00 2001
From: pacien
Date: Thu, 29 Mar 2018 14:40:53 +0200
Subject: Update build tools

---
 app/build.gradle                         | 36 +++++++++++++-------------------
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8197d60..46a5dbd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
   compileSdkVersion 25
-  buildToolsVersion '26.0.2'
 
   defaultConfig {
     applicationId 'org.pacien.tincapp'
     minSdkVersion 21
+    //noinspection OldTargetApi
     targetSdkVersion 21
     multiDexEnabled true
     versionCode 12
@@ -30,37 +30,29 @@ android {
       path 'CMakeLists.txt'
     }
   }
-
-  lintOptions {
-    // 20180212:
-    // Lint checks on Kotlin files only work from the Android Studio IDE.
-    // They currently do not run when you run lint directly from Gradle.
-    // https://developer.android.com/studio/preview/kotlin-issues.html
-    disable 'OnClick', 'UnusedResources'
-  }
 }
 
 dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-  compile 'com.android.support:appcompat-v7:25.4.0'
-  compile 'com.android.support:design:25.4.0'
-  compile 'com.android.support:support-v4:25.4.0'
-  compile 'com.android.support:recyclerview-v7:25.4.0'
-  compile 'com.android.support.constraint:constraint-layout:1.0.2'
+  implementation 'com.android.support:appcompat-v7:25.4.0'
+  implementation 'com.android.support:design:25.4.0'
+  implementation 'com.android.support:support-v4:25.4.0'
+  implementation 'com.android.support:recyclerview-v7:25.4.0'
+  implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 
-  compile('org.apache.commons:commons-configuration2:2.1.1') {
+  implementation('org.apache.commons:commons-configuration2:2.1.1') {
     exclude group: 'commons-logging', module: 'commons-logging'
   }
-  compile('commons-beanutils:commons-beanutils:1.9.3') {
+  implementation('commons-beanutils:commons-beanutils:1.9.3') {
     exclude group: 'commons-logging', module: 'commons-logging'
   }
 
-  compile 'org.bouncycastle:bcpkix-jdk15on:1.57'
-  compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
-  compile 'org.slf4j:slf4j-api:1.7.25'
-  compile 'com.github.tony19:logback-android:1.1.1-9'
-  compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+  implementation 'org.bouncycastle:bcpkix-jdk15on:1.57'
+  implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
+  implementation 'org.slf4j:slf4j-api:1.7.25'
+  implementation 'com.github.tony19:logback-android:1.1.1-9'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 repositories {
diff --git a/build.gradle b/build.gradle
index db659ae..9c0acbd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.0.1'
+    classpath 'com.android.tools.build:gradle:3.1.0'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
     // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c31c053..d2a5220 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 06 13:11:37 CET 2017
+#Thu Mar 29 14:28:27 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
-- 
cgit v1.2.3