Commit 30d86e5c authored by Ricki Hirner's avatar Ricki Hirner 🐑

Update to SDK level 25

parent dfc0289b
Pipeline #5592591 passed with stage
in 4 minutes and 30 seconds
......@@ -2,7 +2,7 @@ image: registry.gitlab.com/bitfireat/davdroid:latest
before_script:
- 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
cache:
paths:
......
......@@ -22,17 +22,18 @@ allprojects {
apply plugin: 'com.android.library'
android {
compileSdkVersion 24
buildToolsVersion '25.0.0'
compileSdkVersion 25
buildToolsVersion '25.0.2'
defaultConfig {
minSdkVersion 9
targetSdkVersion 24
targetSdkVersion 25
}
lintOptions {
disable "GradleDynamicVersion"
disable "ExtraTranslation","MissingTranslation"
disable "RestrictedApi" // https://code.google.com/p/android/issues/detail?id=230387
}
defaultConfig {
......@@ -41,8 +42,8 @@ android {
}
dependencies {
compile 'com.android.support:appcompat-v7:24.+'
compile 'com.android.support:cardview-v7:24.+'
compile 'com.android.support:appcompat-v7:25.+'
compile 'com.android.support:cardview-v7:25.+'
androidTestCompile 'com.android.support.test:runner:0.5+'
androidTestCompile 'com.android.support.test:rules:0.5+'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment