Merge branch 'ci-update' into 'master'

Update CI image and build-tools to 25.0.2 See merge request !427
2016-12-23 16:35:16 +00:00 · 2016-12-23 16:35:16 +00:00 · 56ccc09f90
commit 56ccc09f90
parent 7997024a18 3d20a07c8a
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-20161023
+image: fdroid/ci:client-20161223

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

 android {
    compileSdkVersion 24
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '25.0.2'
    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 '25.0.0'
+    buildToolsVersion '25.0.2'

    defaultConfig {
        minSdkVersion 7