Commit 62ac4921 authored by Ricki Hirner's avatar Ricki Hirner

Update to SDK level 25

* update gradle
parent 659e820f
Pipeline #5592542 passed with stage
in 4 minutes and 19 seconds
......@@ -3,7 +3,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,12 +22,12 @@ 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
}
buildTypes {
release {
......@@ -50,7 +50,7 @@ android {
dependencies {
compile 'org.apache.commons:commons-lang3:3.4'
compile 'com.squareup.okhttp3:okhttp:3.5.0'
provided 'org.projectlombok:lombok:1.16.10'
provided 'org.projectlombok:lombok:1.16.12'
androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.5.0'
......
......@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
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