Merge branch 'new-ci' into 'master'

Bump to new CI image, bump buildTools to 25 See merge request !410
2016-10-25 11:07:39 +00:00 · 2016-10-25 11:07:39 +00:00 · 6aba30fe7f
commit 6aba30fe7f
parent 40665e335a 3af5416f09
3 changed files with 3 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,4 +1,4 @@
-image: fdroid/ci:client-20160927
+image: fdroid/ci:client-20161023

 cache:
  paths:
--- a/app/build.gradle
+++ b/app/build.gradle
@ -146,7 +146,7 @@ if (!hasProperty('sourceDeps')) {

 android {
    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    buildToolsVersion '25.0.0'
    useLibrary 'org.apache.http.legacy'

    buildTypes {
--- a/extern/support-v4-preferencefragment/build.gradle
+++ b/extern/support-v4-preferencefragment/build.gradle
@ -19,7 +19,7 @@ dependencies {

 android {
    compileSdkVersion 19
-    buildToolsVersion '24.0.2'
+    buildToolsVersion '25.0.0'

    defaultConfig {
        minSdkVersion 7