From d8a84389b812216a29f6c4711760c9871e41de73 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 15 Nov 2019 11:59:14 +0100
Subject: [PATCH] update gradle wrapper and build tools

---
 OpenKeychain/build.gradle                | 1 -
 build.gradle                             | 2 +-
 extern/MaterialChipsInput/build.gradle   | 1 -
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 nfcsweetspot/build.gradle                | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 0ec1a8855..8918c07f2 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -109,7 +109,6 @@ dependencies {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 15
diff --git a/build.gradle b/build.gradle
index 527117962..4e3b6cb2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         // bintray dependency to satisfy dependency of openpgp-api lib
         classpath 'com.novoda:bintray-release:0.8.0'
         classpath 'com.squareup.sqldelight:gradle-plugin:0.7.0'
diff --git a/extern/MaterialChipsInput/build.gradle b/extern/MaterialChipsInput/build.gradle
index 759457a57..860378783 100644
--- a/extern/MaterialChipsInput/build.gradle
+++ b/extern/MaterialChipsInput/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.3"
 
     defaultConfig {
         minSdkVersion 15
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 06d481c52..721ad9dfe 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.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
diff --git a/nfcsweetspot/build.gradle b/nfcsweetspot/build.gradle
index 144a8145c..47545db9c 100644
--- a/nfcsweetspot/build.gradle
+++ b/nfcsweetspot/build.gradle
@@ -5,7 +5,6 @@ dependencies {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 14