summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2022-04-19 15:49:53 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2022-04-20 05:33:22 +0200
commit2a58d87beeb08fb19d24097e4a22f77c37a1570c (patch)
treeb7083efc92a3dc90b3cc3fdbbdb9ee7715281361
parent7ee3af34fe7681663ad8faf5082d39e1b6ec96dc (diff)
android: Update Android Gradle Plugin to 7.1.3
... and gradle to 7.2, which is what Android Studio suggested and did automatically when confirming. Also apply the following optional, but recommended change while doing so: > Migrate from lintOptions to lint > Configuration related to lint is now performed using the lint block. Change-Id: Ia982d72d877e229c3006c6d528b830d16c88481f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133179 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 39326bc7d439170dd24c9d4b837c2cdb720b5d6f)
-rw-r--r--android/source/build.gradle4
-rw-r--r--android/source/gradle/wrapper/gradle-wrapper.properties2
2 files changed, 3 insertions, 3 deletions
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 6b7391d5e389..47661f79c4cc 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -16,7 +16,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.6.1'
+ classpath 'com.android.tools.build:gradle:7.1.3'
}
}
@@ -81,7 +81,7 @@ android {
}
fullUI.dimension "default"
}
- lintOptions {
+ lint {
// don't error-out on missing translations
warning 'MissingTranslation'
}
diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties
index 7d1cfd365805..2d5e5400a6ed 100644
--- a/android/source/gradle/wrapper/gradle-wrapper.properties
+++ b/android/source/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-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip