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 ...@@ -3,7 +3,7 @@ image: registry.gitlab.com/bitfireat/davdroid:latest
before_script: before_script:
- export GRADLE_USER_HOME=`pwd`/.gradle - export GRADLE_USER_HOME=`pwd`/.gradle
- chmod +x gradlew - 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: cache:
paths: paths:
......
...@@ -22,12 +22,12 @@ apply plugin: 'com.android.library' ...@@ -22,12 +22,12 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 24 compileSdkVersion 25
buildToolsVersion '25.0.0' buildToolsVersion '25.0.2'
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 24 targetSdkVersion 25
} }
buildTypes { buildTypes {
release { release {
...@@ -50,7 +50,7 @@ android { ...@@ -50,7 +50,7 @@ android {
dependencies { dependencies {
compile 'org.apache.commons:commons-lang3:3.4' compile 'org.apache.commons:commons-lang3:3.4'
compile 'com.squareup.okhttp3:okhttp:3.5.0' 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' androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.5.0'
......
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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