summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2021-02-12 00:38:32 +0100
committercyBerta <cyberta@riseup.net>2021-02-26 10:03:31 +0100
commit8957b5f7480ffb30df8e79ebcbf539ba195f66b1 (patch)
treeaf512156f2c34242a171126c6b9c0a195d6384cc
parent8bb73089566e78a195f21f4746c9db416abf95a4 (diff)
update gradle and gradle plugin, fix deprecated method call
-rw-r--r--app/build.gradle2
-rw-r--r--build.gradle2
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
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