From aaf36f654d4c8e9f013b2a662922846f20f732b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Fri, 12 Dec 2014 12:39:12 +0100 Subject: [PATCH] Update build-tools to 21.1.1 --- buildserver/config.buildserver.py | 2 +- buildserver/cookbooks/android-sdk/recipes/default.rb | 2 +- examples/config.py | 2 +- fdroidserver/common.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py index 29fbe07d..eb715c3d 100644 --- a/buildserver/config.buildserver.py +++ b/buildserver/config.buildserver.py @@ -1,6 +1,6 @@ sdk_path = "/home/vagrant/android-sdk" ndk_path = "/home/vagrant/android-ndk" -build_tools = "21.0.2" +build_tools = "21.1.1" ant = "ant" mvn3 = "mvn" gradle = "gradle" diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb index 1f0f6b5f..1a42a61a 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 = "21.0.2" + ver = "21.1.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 974a4d5b..616aa0b0 100644 --- a/examples/config.py +++ b/examples/config.py @@ -9,7 +9,7 @@ # Override the path to the Android NDK, $ANDROID_NDK by default # ndk_path = "/path/to/android-ndk" # Build tools version to be used -build_tools = "21.0.2" +build_tools = "21.1.1" # Command for running Ant # ant = "/path/to/ant" diff --git a/fdroidserver/common.py b/fdroidserver/common.py index f6e9538f..fd04a4db 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -42,7 +42,7 @@ env = None default_config = { 'sdk_path': "$ANDROID_HOME", 'ndk_path': "$ANDROID_NDK", - 'build_tools': "21.0.2", + 'build_tools': "21.1.1", 'ant': "ant", 'mvn3': "mvn", 'gradle': 'gradle', -- 2.30.2