From d5807e44af9017f3e467eba142907993be549226 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Fri, 30 Dec 2016 02:23:45 +0100
Subject: [PATCH] Update to SDK level 25

---
 .gitlab-ci.yml   |  2 +-
 app/build.gradle | 17 +++++++++--------
 cert4android     |  2 +-
 dav4android      |  2 +-
 ical4android     |  2 +-
 vcard4android    |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb50614b..bc9668f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: registry.gitlab.com/bitfireat/davdroid:latest
 before_script:
   - git submodule update --init --recursive
   - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew
-  - emulator64-arm -avd test -no-skin -no-audio -no-window & wait-for-emulator.sh
+  - emulator64-arm -avd test -no-audio -no-window & wait-for-emulator.sh
   - wget -q https://f-droid.org/repo/org.dmfs.tasks_103.apk && adb install org.dmfs.tasks_103.apk
 
 cache:
diff --git a/app/build.gradle b/app/build.gradle
index aed30023..a2613c7a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,14 +9,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '25.0.0'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "at.bitfire.davdroid"
 
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 25
 
         versionCode 130
 
@@ -53,6 +53,7 @@ android {
         disable 'RtlEnabled'
         disable 'RtlHardcoded'
         disable 'Typos'
+        disable "RestrictedApi"		// https://code.google.com/p/android/issues/detail?id=230387
     }
     packagingOptions {
         exclude 'LICENSE'
@@ -71,10 +72,10 @@ dependencies {
     compile project(':ical4android')
     compile project(':vcard4android')
 
-    compile 'com.android.support:appcompat-v7:24.+'
-    compile 'com.android.support:cardview-v7:24.+'
-    compile 'com.android.support:design:24.+'
-    compile 'com.android.support:preference-v14:24.+'
+    compile 'com.android.support:appcompat-v7:25.+'
+    compile 'com.android.support:cardview-v7:25.+'
+    compile 'com.android.support:design:25.+'
+    compile 'com.android.support:preference-v14:25.+'
 
     compile 'com.github.yukuku:ambilwarna:2.0.1'
 
@@ -82,7 +83,7 @@ dependencies {
     compile 'dnsjava:dnsjava:2.1.7'
     compile 'org.apache.commons:commons-lang3:3.4'
     compile 'org.apache.commons:commons-collections4:4.1'
-    provided 'org.projectlombok:lombok:1.16.10'
+    provided 'org.projectlombok:lombok:1.16.12'
 
     // for tests
     androidTestCompile('com.android.support.test:runner:0.5') {
diff --git a/cert4android b/cert4android
index 704955ee..30d86e5c 160000
--- a/cert4android
+++ b/cert4android
@@ -1 +1 @@
-Subproject commit 704955ee830d9254f1a3674888fb60dd56535715
+Subproject commit 30d86e5ce483a3efe61aa2ec911ea1dcf517f73f
diff --git a/dav4android b/dav4android
index 659e820f..62ac4921 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 659e820f357f7552c1ef96f5cd0449d12d743cd0
+Subproject commit 62ac4921ec5d5f366d0d79169a4bba94eb65ef48
diff --git a/ical4android b/ical4android
index 4a4acb5b..5d4cce1e 160000
--- a/ical4android
+++ b/ical4android
@@ -1 +1 @@
-Subproject commit 4a4acb5b2fd22f5bb4633125ec05dd7389ea57c7
+Subproject commit 5d4cce1ed7045d903e50796a4599e341bb0246e8
diff --git a/vcard4android b/vcard4android
index 28e1c5a3..20733b17 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit 28e1c5a3b7c372f26a4b54db22c1a1f73d68f19b
+Subproject commit 20733b17bce7ec08f978a58d0204119f844b1a28