From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 10 Sep 2016 09:43:04 +0000 (+0200)
Subject: all: bump to build-tools 24.0.2
X-Git-Tag: 0.7.0~1^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=fd7a8c83c84ed817e1bb66d6bd18d9d83529fe1e

all: bump to build-tools 24.0.2

Update the docker image to include it there too.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 087aafc2..8f992e7a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:server-20160820
+image: mvdan/fdroid-ci:server-20160909
 
 test:
   script:
diff --git a/.travis.yml b/.travis.yml
index 45a80499..28809377 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.1;
+      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-24.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 43eceb1d..c5235ec6 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -22,7 +22,7 @@
 # }
 
 # Build tools version to be used
-# build_tools = "24.0.1"
+# build_tools = "24.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 6f12b60b..ef7a1aeb 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -60,7 +60,7 @@ default_config = {
         'r11c': None,
         'r12b': "$ANDROID_NDK",
     },
-    'build_tools': "24.0.1",
+    'build_tools': "24.0.2",
     'force_build_tools': False,
     'java_paths': None,
     'ant': "ant",