Merge branch 'new-ci' into 'master'

Bump to new CI image, bump buildTools to 25

See merge request !410
This commit is contained in:
Daniel Martí 2016-10-25 11:07:39 +00:00
commit 6aba30fe7f
3 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
image: fdroid/ci:client-20160927 image: fdroid/ci:client-20161023
cache: cache:
paths: paths:

View File

@ -146,7 +146,7 @@ if (!hasProperty('sourceDeps')) {
android { android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion '24.0.2' buildToolsVersion '25.0.0'
useLibrary 'org.apache.http.legacy' useLibrary 'org.apache.http.legacy'
buildTypes { buildTypes {

View File

@ -19,7 +19,7 @@ dependencies {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '24.0.2' buildToolsVersion '25.0.0'
defaultConfig { defaultConfig {
minSdkVersion 7 minSdkVersion 7