From 148f077ad84577c5b5e5df8c3b68acea58ab7a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 23 Oct 2016 16:58:37 +0100
Subject: [PATCH] Bump ci images and default build-tools

---
 .gitlab-ci.yml         | 2 +-
 .travis.yml            | 2 +-
 examples/config.py     | 2 +-
 fdroidserver/common.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f992e7a..6a8ae565 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:server-20160909
+image: fdroid/ci:server-20161023
 
 test:
   script:
diff --git a/.travis.yml b/.travis.yml
index 28809377..7694fdad 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-24.0.2;
+      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-25.0.0;
       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 2e6167cc..63edc718 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -25,7 +25,7 @@
 # }
 
 # Build tools version to be used
-# build_tools = "24.0.2"
+# build_tools = "25.0.0"
 
 # 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 51863529..6c5e3faa 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -61,7 +61,7 @@ default_config = {
         'r12b': "$ANDROID_NDK",
     },
     'qt_sdk_path': None,
-    'build_tools': "24.0.2",
+    'build_tools': "25.0.0",
     'force_build_tools': False,
     'java_paths': None,
     'ant': "ant",