From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 23 Dec 2016 16:46:09 +0000 (+0100)
Subject: Bump CI image, now with build-tools 25.0.2
X-Git-Tag: 0.8~138^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=926aafa58b2b9b5d12553da2a4110eb2d805f9be;p=fdroidserver.git

Bump CI image, now with build-tools 25.0.2
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1fd0f4fc..a730e39e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: fdroid/ci:server-20161031
+image: fdroid/ci:server-20161223
 
 test:
   script:
diff --git a/.travis.yml b/.travis.yml
index 7694fdad..58b28ebe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ install:
       sudo pip3 install pep8 pyflakes pylint;
       sudo pip3 install -e  .;
       sudo rm -rf fdroidserver.egg-info;
-      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-25.0.0;
+      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-25.0.2;
       elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
       sudo apt-get -q update -y;
diff --git a/examples/config.py b/examples/config.py
index 9ccdc5c9..176e576c 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -26,7 +26,7 @@
 # }
 
 # Build tools version to be used
-# build_tools = "25.0.0"
+# build_tools = "25.0.2"
 
 # Force all build to use the above version of build -tools, good for testing
 # builds without having all of the possible build-tools installed.
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index d1c12d5c..b5e06280 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -62,7 +62,7 @@ default_config = {
         'r13b': None,
     },
     'qt_sdk_path': None,
-    'build_tools': "25.0.0",
+    'build_tools': "25.0.2",
     'force_build_tools': False,
     'java_paths': None,
     'ant': "ant",