Update build-tools to 20.0.0

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index a09a40658d06d0e3340c9a528fe69e982efe2a93..ffc9cca08d429d1389431e126f2aab86c8d52cb4 100644 (file)
--- 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 = "19.1.0"
+build_tools = "20.0.0"
 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 741288338bfafc0d7c02ec52fb090b15c7ce0ac8..9635afdd7f8bf3570f53645dd3e4d69faa58a738 100644 (file)
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -32,7 +32,7 @@ end
 script "add_build_tools" do
   interpreter "bash"
   user user
-  ver = "19.1.0"
+  ver = "20.0.0"
   cwd "/tmp"
   code "
     if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then

diff --git a/examples/config.py b/examples/config.py
index ed34e6488baa0f15a78ad8f58683c82fd0327369..1eee3f1f56d24d01736a889b30c3b8991b7a8ac7 100644 (file)
--- 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 = "19.0.2"
+build_tools = "20.0.0"
 
 # Command for running Ant
 # ant = "/path/to/ant"

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 79ac0b31385a9ce990da2fbcf74064bf34aefe88..928610e0a74351a8bd2db80c3d27dea45b2a5835 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -42,7 +42,7 @@ def get_default_config():
     return {
         'sdk_path': os.getenv("ANDROID_HOME"),
         'ndk_path': os.getenv("ANDROID_NDK"),
-        'build_tools': "19.1.0",
+        'build_tools': "20.0.0",
         'ant': "ant",
         'mvn3': "mvn",
         'gradle': 'gradle',

diff --git a/tests/run-tests b/tests/run-tests
index a3b5e76b20a7a1e64b958c4371020f7df0fd78ef..11aa2deb3a01e70462ba52e3147fab53b0d662a1 100755 (executable)
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -25,8 +25,8 @@ copy_apks_into_repo() {
 
 create_fake_android_home() {
     mkdir $1/build-tools
-    mkdir $1/build-tools/19.1.0
-    touch $1/build-tools/19.1.0/aapt
+    mkdir $1/build-tools/20.0.0
+    touch $1/build-tools/20.0.0/aapt
 }
 
 create_test_dir() {