From 66e82cb077c36ad32e25d135fe3bb4915697cadb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 5 Nov 2015 11:55:19 +0100 Subject: [PATCH] Bump build-tools to 23.0.2 --- .gitlab-ci.yml | 4 ++-- buildserver/cookbooks/android-sdk/recipes/default.rb | 2 +- examples/config.py | 2 +- fdroidserver/common.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74ae0393..a1b3148a 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.1 + - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.2 - export PATH="$ANDROID_HOME/platform-tools:$PATH" - - export PATH="$ANDROID_HOME/build-tools/23.0.1:$PATH" + - export PATH="$ANDROID_HOME/build-tools/23.0.2:$PATH" test: script: diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb index ce187ea2..42b8b988 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.1" + ver = "23.0.2" cwd "/tmp" code " if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then diff --git a/examples/config.py b/examples/config.py index b72b18a1..2aaaed10 100644 --- a/examples/config.py +++ b/examples/config.py @@ -23,7 +23,7 @@ # } # Build tools version to be used -# build_tools = "23.0.1" +# build_tools = "23.0.2" # Command or path to binary for running Ant # ant = "ant" diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 2d44fc9c..ce7e7328 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -56,7 +56,7 @@ default_config = { 'r9b': None, 'r10e': "$ANDROID_NDK", }, - 'build_tools': "23.0.1", + 'build_tools': "23.0.2", 'java_paths': { '1.7': "/usr/lib/jvm/java-7-openjdk", '1.8': None, -- 2.30.2