1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-04 16:30:12 +02:00

Add and switch to build-tools 23.0.3

Also bump to the CI image which contains it.
This commit is contained in:
Daniel Martí 2016-04-05 10:49:30 +01:00
parent a345e351ba
commit ec9087d057
6 changed files with 8 additions and 5 deletions

View File

@ -1,4 +1,4 @@
image: mvdan/fdroid-ci:base-20160329
image: mvdan/fdroid-ci:base-20160405
test:
script:

View File

@ -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;

View File

@ -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"

View File

@ -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"

View File

@ -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",

View File

@ -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',