[Libreoffice-commits] core.git: android/source

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Fri Sep 22 19:41:43 UTC 2017


 android/source/build.gradle |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 09d954447f743b83858a2d2afa1dcb1f3ada683c
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Sep 22 17:40:44 2017 +0200

    android: bump support library & buildtools/SDK versions
    
    also add google maven repo, since
    
    "The support libraries are now available through Google's Maven
    repository. We no longer support downloading the libraries through the
    SDK Manager, and that functionality will be removed soon.."
    https://developer.android.com/topic/libraries/support-library/setup.html
    
    Change-Id: Ica0a2542903f60c7bffa1daa2409b60422bde88f

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 970ffeed3534..2cc745ab6429 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -1,11 +1,16 @@
 project.ext.set("archivesBaseName", "LibreOfficeViewer")
-//build-time dependencies - android plugin for gradle
-buildscript {
+allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
+}
+//build-time dependencies - android plugin for gradle
+buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
@@ -24,14 +29,13 @@ dependencies {
     ])
     compile files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
     compile files("${liboWorkdir}/UnpackedTarball/owncloud_android_lib/bin/owncloud-android-library.jar")
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:design:26.1.0' // also pulls-in corresponding support libraries
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     compileOptions {
         // silence some java-language features hints
         sourceCompatibility 6


More information about the Libreoffice-commits mailing list