[Libreoffice-commits] online.git: android/app

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Wed Dec 11 19:42:03 UTC 2019


 android/app/build.gradle |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit b9df7da0fffc49de72dd4da9a4ea5f4e9f4db968
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Dec 11 20:12:45 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Dec 11 20:41:46 2019 +0100

    android: Fix build after the recent Nextcloud's android-library update.
    
    Thanks Tobi for the hint!
    
    Change-Id: I00b7ef4aaef7ced1d26d3d5636189e239897ecea
    Reviewed-on: https://gerrit.libreoffice.org/84979
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 84f5ef91c..158ea2ddf 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -5,11 +5,13 @@ apply from: 'appSettings.gradle'
 
 android {
     compileSdkVersion 28
+
     defaultConfig {
         // applicationId, versionCode and versionName are defined in appSettings.gradle
         minSdkVersion 21
         targetSdkVersion 28
     }
+
     buildTypes {
         debug {
             resValue "string", "app_name", "${liboAppName} Debug"
@@ -40,6 +42,11 @@ android {
                     'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 repositories {
@@ -54,7 +61,9 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'com.google.android.material:material:1.1.0-alpha04'
+
     implementation 'com.github.nextcloud:android-library:-SNAPSHOT'
+    implementation "commons-httpclient:commons-httpclient:3.1 at jar" // remove after entire switch to lib v2
 
     //before changing the version please see https://issuetracker.google.com/issues/111662669
     implementation 'androidx.preference:preference:1.1.0-alpha01'


More information about the Libreoffice-commits mailing list