Merge branch 'new-ci' into 'master'
Bump to new CI image, bump buildTools to 25 See merge request !410
This commit is contained in:
commit
6aba30fe7f
@ -1,4 +1,4 @@
|
|||||||
image: fdroid/ci:client-20160927
|
image: fdroid/ci:client-20161023
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
|
@ -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 {
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user