From a345e351bac6ad5d6f706280f8091b3f9190d7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 5 Apr 2016 10:49:15 +0100 Subject: [PATCH 1/2] Add Gradle 2.12 to the buildserver --- buildserver/cookbooks/gradle/recipes/gradle | 6 +++--- makebuildserver | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/buildserver/cookbooks/gradle/recipes/gradle b/buildserver/cookbooks/gradle/recipes/gradle index 4e0c361e..b43488d5 100755 --- a/buildserver/cookbooks/gradle/recipes/gradle +++ b/buildserver/cookbooks/gradle/recipes/gradle @@ -23,11 +23,11 @@ contains() { # key-value pairs of what gradle version each gradle plugin version # should accept -d_plugin_k=(1.5 1.3 1.2 1.1 1.0 0.14 0.13 0.12 0.11 0.10 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2) -d_plugin_v=(2.4 2.4 2.3 2.2.1 2.2.1 2.1 2.1 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4) +d_plugin_k=( 2.1 2.0 1.5 1.3 1.2 1.1 1.0 0.14 0.13 0.12 0.11 0.10 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2) +d_plugin_v=(2.12 2.12 2.4 2.4 2.3 2.2.1 2.2.1 2.1 2.1 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4) # All gradle versions we know about -plugin_v=(2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4) +plugin_v=(2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4) # Find the highest version available for v in ${plugin_v[*]}; do diff --git a/makebuildserver b/makebuildserver index 18df6123..98294335 100755 --- a/makebuildserver +++ b/makebuildserver @@ -273,6 +273,9 @@ cachefiles = [ ('gradle-2.11-bin.zip', 'https://services.gradle.org/distributions/gradle-2.11-bin.zip', '8d7437082356c9fd6309a4479c8db307673965546daea445c6c72759cd6b1ed6'), + ('gradle-2.12-bin.zip', + 'https://services.gradle.org/distributions/gradle-1.12-bin.zip', + 'e77064981906cd0476ff1e0de3e6fef747bd18e140960f1915cca8ff6c33ab5c'), ('Kivy-1.7.2.tar.gz', 'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz', '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'), From ec9087d057dc4b46d07e8aa3c88a4fe7ccefde4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 5 Apr 2016 10:49:30 +0100 Subject: [PATCH 2/2] Add and switch to build-tools 23.0.3 Also bump to the CI image which contains it. --- .gitlab-ci.yml | 2 +- .travis.yml | 2 +- buildserver/cookbooks/android-sdk/recipes/default.rb | 2 +- examples/config.py | 2 +- fdroidserver/common.py | 2 +- makebuildserver | 3 +++ 6 files changed, 8 insertions(+), 5 deletions(-) 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',