From 8957b5f7480ffb30df8e79ebcbf539ba195f66b1 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 12 Feb 2021 00:38:32 +0100
Subject: update gradle and gradle plugin, fix deprecated method call

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

diff --git a/app/build.gradle b/app/build.gradle
index 5b16f8e9..18be6ae1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -426,7 +426,7 @@ android.applicationVariants.all { variant ->
   }
 
   // remove unrelated abi specific assets
-  variant.mergeAssets.doLast {
+  variant.mergeAssetsProvider.get().doLast {
     // if not a fat build
     if (abiDimension.abiVersionCode > 0) {
       def filesToDelete = fileTree(dir: variant.mergeAssets.outputDir, excludes: ["*pie_openvpn.${abiDimension.abiFilter}",
diff --git a/build.gradle b/build.gradle
index bb336511..a995fd04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
       google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.4.1'
+    classpath 'com.android.tools.build:gradle:4.1.2'
   }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e264661d..5e689c00 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun May 19 00:15:53 CEST 2019
+#Thu Feb 11 23:53:25 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
-- 
cgit v1.2.3