From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 6 Sep 2015 02:59:35 +0000 (-0400)
Subject: Bump build-tools
X-Git-Tag: 0.5.0~127
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=41443edd555810c850649b37eb16276d98a7f0e9;p=fdroidserver.git

Bump build-tools
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09854c87..a66d2d59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,9 +23,9 @@ before_script:
   - export ANDROID_HOME=$PWD/android-sdk
   - export PATH="$ANDROID_HOME/tools:$PATH"
   - echo " == Installing Android SDK components"
-  - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.0
+  - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.1
   - export PATH="$ANDROID_HOME/platform-tools:$PATH"
-  - export PATH="$ANDROID_HOME/build-tools/23.0.0:$PATH"
+  - export PATH="$ANDROID_HOME/build-tools/23.0.1:$PATH"
 
 test:
   script:
diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 3331b849..8a8c77b2 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -26,7 +26,7 @@ end
 script "add_build_tools" do
   interpreter "bash"
   user user
-  ver = "23.0.0"
+  ver = "23.0.1"
   cwd "/tmp"
   code "
     if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
diff --git a/examples/config.py b/examples/config.py
index cf8bf886..fac101d8 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -16,7 +16,7 @@
 # }
 
 # Build tools version to be used
-build_tools = "23.0.0"
+build_tools = "23.0.1"
 
 # Command or path to binary for running Ant
 ant = "ant"
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 2cd4bdd2..b6137520 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -55,7 +55,7 @@ default_config = {
         'r9b': None,
         'r10e': "$ANDROID_NDK",
     },
-    'build_tools': "23.0.0",
+    'build_tools': "23.0.1",
     'ant': "ant",
     'mvn3': "mvn",
     'gradle': 'gradle',