Update android containerandroid-14

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

2 files changed, 15 insertions, 7 deletions

diff --git a/android/Dockerfile b/android/Dockerfile
index 4dc38aa..137422f 100644
--- a/android/Dockerfile
+++ b/android/Dockerfile
@@ -1,7 +1,4 @@
-FROM jacekmarchwicki/android:java8-r24-4-1
-
-# currently used image is included in the base image
-RUN cd /opt && /opt/tools/android-accept-licenses.sh "android-sdk-linux/tools/android update sdk --all --no-ui --filter tools,platform-tools,build-tools-24.0.2,android-24,extra-android-m2repository,extra-android-support,sys-img-armeabi-v7a-android-24"
+FROM jacekmarchwicki/android:java7-8-r25
 
 RUN apt-get update && apt-get install -y libxdamage1 libxfixes3 libpulse0 && apt-get clean
 
diff --git a/android/gradle/build.gradle b/android/gradle/build.gradle
index b9fd877..c65520d 100644
--- a/android/gradle/build.gradle
+++ b/android/gradle/build.gradle
@@ -8,9 +8,12 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
@@ -20,12 +23,15 @@ apply plugin: 'pmd'
 apply plugin: 'findbugs'
 
 ext {
-    supportLibraryVersion = '24.2.1'
+    supportLibraryVersion = '25.0.0'
 }
 
 repositories {
     jcenter()
     maven { url "https://jitpack.io" }
+    maven {
+        url 'https://oss.sonatype.org/content/repositories/snapshots/'
+    }
 
     flatDir {
         dirs 'libs'
@@ -34,14 +40,19 @@ repositories {
 
 dependencies {
     /// dependencies for app building
+    compile 'com.android.support:multidex:1.0.1'
 
+    compile 'com.github.nextcloud:android-library:1.0.11'
     compile "com.android.support:support-v4:${supportLibraryVersion}"
     compile "com.android.support:design:${supportLibraryVersion}"
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
-    compile "com.android.support:cardview-v7:${supportLibraryVersion}"
     compile 'com.getbase:floatingactionbutton:1.10.1'
 
+    compile 'com.google.code.findbugs:annotations:2.0.1'
+    compile group: 'commons-io', name: 'commons-io', version: '2.4'
+    compile 'com.google.android.gms:play-services:10.2.0'
+    compile 'com.evernote:android-job:1.1.7-SNAPSHOT'
 
     /// dependencies for local unit tests
     testCompile 'junit:junit:4.12'