From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 24 Jun 2016 15:54:30 +0000 (+0100)
Subject: all: add and switch to build-tools v24
X-Git-Tag: 0.7.0~41^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=b026874353d90f0ac01c50bc5d1a56039e3ff238;p=fdroidserver.git

all: add and switch to build-tools v24
---

diff --git a/.travis.yml b/.travis.yml
index abdf6d3a..7c2300dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,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-23.0.3;
+      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-24.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 5ae2983f..97628e7e 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -20,7 +20,7 @@
 # }
 
 # Build tools version to be used
-# build_tools = "23.0.3"
+# build_tools = "24.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 f27177fe..732d18d2 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -58,7 +58,7 @@ default_config = {
         'r9b': None,
         'r10e': "$ANDROID_NDK",
     },
-    'build_tools': "23.0.3",
+    'build_tools': "24.0.0",
     'force_build_tools': False,
     'java_paths': None,
     'ant': "ant",
diff --git a/makebuildserver b/makebuildserver
index 44c43256..8abe63f4 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -177,6 +177,8 @@ cachefiles = [
      '82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
     ('https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip',
      'd961663d4a9e128841751c0156548a347c882c081c83942e53788d8949bf34e1'),
+    ('https://dl.google.com/android/repository/build-tools_r24-linux.zip',
+     'b4871f357224c5f660fd2bbee04d8c7d1c187eeddfd9702cc84503529e3b3724'),
     # the binaries that Google uses are here:
     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('https://services.gradle.org/distributions/gradle-1.4-bin.zip',