diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-06 12:16:24 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-06 16:49:32 +0100 |
| commit | a93770e6d0d2fcc5a2eefbed546acee055833fd4 (patch) | |
| tree | 042aa8c13b738df59d4eb8d71f17cbb597177072 | |
| parent | 9fa6312b342cf0ec4f98cfffffd5fdc172707a33 (diff) | |
android: Update gradle
The previous version e.g. did not support building
Android App Bundles yet.
Drop explicit 'buildToolsVersion', as suggested in the warning
during build:
> WARNING: The specified Android SDK Build Tools version (27.0.3) is ignored,
> as it is below the minimum supported version (28.0.3) for Android Gradle
> Plugin 3.6.1.
> Android SDK Build Tools 28.0.3 will be used.
> To suppress this warning, remove "buildToolsVersion '27.0.3'" from your build.gradle
> file, as each version of the Android Gradle Plugin now has a default
> version of the build tools.
Change-Id: Iea5018366969fcefde1e9f4e8cb9836f5a09b41e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90099
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | android/source/build.gradle | 3 | ||||
| -rw-r--r-- | android/source/gradle/wrapper/gradle-wrapper.properties | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/android/source/build.gradle b/android/source/build.gradle index 5c20e5dcba99..0ed1659e9081 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -19,7 +19,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.6.1' } } @@ -38,7 +38,6 @@ dependencies { android { compileSdkVersion 28 - buildToolsVersion "27.0.3" compileOptions { // silence some java-language features hints sourceCompatibility 6 diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties index 617dcf1065c3..7d1cfd365805 100644 --- a/android/source/gradle/wrapper/gradle-wrapper.properties +++ b/android/source/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 18 16:50:44 CEST 2018 +#Tue Mar 03 14:01:57 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip |