From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 5 Apr 2016 09:49:30 +0000 (+0100)
Subject: Add and switch to build-tools 23.0.3
X-Git-Tag: 0.7.0~69^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ec9087d057dc4b46d07e8aa3c88a4fe7ccefde4a;p=fdroidserver.git

Add and switch to build-tools 23.0.3

Also bump to the CI image which contains it.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4ef1297..c585e7de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:base-20160329
+image: mvdan/fdroid-ci:base-20160405
 
 test:
   script:
diff --git a/.travis.yml b/.travis.yml
index 8fe55874..f0b25ad1 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.2;
+      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-23.0.3;
       elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
       sudo apt-get -q update -y;
diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 98aa4dc3..7e76930b 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -62,7 +62,7 @@ end
 
 %w{17.0.0 18.0.1 18.1.0 18.1.1 19.0.0 19.0.1 19.0.2 19.0.3 19.1.0
     20.0.0 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1 21.1.2 22.0.0 22.0.1
-    23.0.0 23.0.1 23.0.2
+    23.0.0 23.0.1 23.0.2 23.0.3
 }.each do |ver|
   script "add_btools_#{ver}" do
     interpreter "bash"
diff --git a/examples/config.py b/examples/config.py
index f022c2b0..56ed7b86 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -23,7 +23,7 @@
 # }
 
 # Build tools version to be used
-# build_tools = "23.0.2"
+# build_tools = "23.0.3"
 
 # Command or path to binary for running Ant
 # ant = "ant"
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 67ef0c08..86937640 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -58,7 +58,7 @@ default_config = {
         'r9b': None,
         'r10e': "$ANDROID_NDK",
     },
-    'build_tools': "23.0.2",
+    'build_tools': "23.0.3",
     'java_paths': None,
     'ant': "ant",
     'mvn3': "mvn",
diff --git a/makebuildserver b/makebuildserver
index 98294335..1fa18343 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -214,6 +214,9 @@ cachefiles = [
     ('build-tools-23.0.2.zip',
      'https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip',
      '82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
+    ('build-tools-23.0.3.zip',
+     'https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip',
+     'd961663d4a9e128841751c0156548a347c882c081c83942e53788d8949bf34e1'),
     # the binaries that Google uses are here:
     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('gradle-1.4-bin.zip',