Merge pull request #25 from nextcloud/android25

Update to Android v25 and gradle plugin 2.2.2

android/Dockerfile

@@ -1,7 +1,7 @@
 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 sys-img-armeabi-v7a-android-24"
+#RUN cd /opt && /opt/tools/android-accept-licenses.sh "android-sdk-linux/tools/android update sdk --all --no-ui --filter sys-img-armeabi-v7a-android-25"
 
 RUN apt-get update && apt-get install -y libxdamage1 libxfixes3 libpulse0 && apt-get clean
 

android/gradle/build.gradle

@@ -10,14 +10,17 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'checkstyle'
+apply plugin: 'pmd'
+apply plugin: 'findbugs'
 
 ext {
-    supportLibraryVersion = '24.2.0'
+    supportLibraryVersion = '25.0.0'
 }
 
 repositories {
@@ -59,8 +62,7 @@ dependencies {
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
 
     // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
-    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
-
+    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
 }
 
 tasks.withType(Test) {
@@ -71,8 +73,8 @@ tasks.withType(Test) {
 }
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -86,5 +88,4 @@ android {
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
-
 }