summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-06-29 21:15:29 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-06-30 11:23:52 +0200
commitaea65dc3f97f05d2f4f53da8a2ed8b5a62657bc7 (patch)
treede02685bc96fd1587f5aeb964ecd09659082245b /android
parent044b73b2adcbd739a186ddaea5830db7ff605f09 (diff)
android: bump gradle, gradle-plugin, support libary & target versions
Change-Id: I971f02c624a19ec58539738f5e736a986b5ba0d6
Diffstat (limited to 'android')
-rw-r--r--android/source/build.gradle19
-rw-r--r--android/source/gradle/wrapper/gradle-wrapper.properties4
2 files changed, 10 insertions, 13 deletions
diff --git a/android/source/build.gradle b/android/source/build.gradle
index c2d4aeae0e56..2fa5dda5b817 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -5,9 +5,8 @@ apply from: 'liboSettings.gradle'
project.ext.set("archivesBaseName", "LibreOfficeViewer")
allprojects {
repositories {
- maven {
- url "https://maven.google.com"
- }
+ jcenter()
+ google()
flatDir {
dirs "${liboWorkdir}/UnpackedTarball/owncloud_android_lib/build/outputs/aar"
}
@@ -17,12 +16,10 @@ allprojects {
buildscript {
repositories {
jcenter()
- maven {
- url "https://maven.google.com"
- }
+ google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.android.tools.build:gradle:3.1.3'
}
}
@@ -38,13 +35,13 @@ dependencies {
implementation files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
debugImplementation(name:'owncloud_android_lib-debug', ext:'aar')
releaseImplementation(name:'owncloud_android_lib-release', ext:'aar')
- implementation 'com.android.support:design:27.0.1' // also pulls-in corresponding support libraries
- implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ implementation 'com.android.support:design:27.1.1' // also pulls-in corresponding support libraries
+ implementation 'com.android.support.constraint:constraint-layout:1.1.2'
}
android {
compileSdkVersion 26
- buildToolsVersion "27.0.1"
+ buildToolsVersion "27.0.3"
compileOptions {
// silence some java-language features hints
sourceCompatibility 6
@@ -64,7 +61,7 @@ android {
}
defaultConfig {
minSdkVersion 14
- targetSdkVersion 24
+ targetSdkVersion 26
vectorDrawables.useSupportLibrary = true
}
buildTypes {
diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties
index 26a7675eb5fc..1490158923d0 100644
--- a/android/source/gradle/wrapper/gradle-wrapper.properties
+++ b/android/source/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 20 19:19:05 CET 2017
+#Fri May 18 16:50:44 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip