mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: add and switch to build-tools v24

Browse source
This commit is contained in:
Daniel Martí 2016-06-24 16:54:30 +01:00
parent 063d581b71
commit b026874353
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -27,7 +27,7 @@ install:
sudo pip3 install pep8 pyflakes pylint; sudo pip3 install pep8 pyflakes pylint;
sudo pip3 install -e .; sudo pip3 install -e .;
sudo rm -rf fdroidserver.egg-info; sudo rm -rf fdroidserver.egg-info;
echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-23.0.3; echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-24.0.0;
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo add-apt-repository ppa:guardianproject/fdroidserver -y; sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
sudo apt-get -q update -y; sudo apt-get -q update -y;

2
examples/config.py
View file

@ -20,7 +20,7 @@
# } # }
# Build tools version to be used # Build tools version to be used
# build_tools = "23.0.3" # build_tools = "24.0.0"
# Force all build to use the above version of build -tools, good for testing # Force all build to use the above version of build -tools, good for testing
# builds without having all of the possible build-tools installed. # builds without having all of the possible build-tools installed.

2
fdroidserver/common.py
View file

@ -58,7 +58,7 @@ default_config = {
'r9b': None, 'r9b': None,
'r10e': "$ANDROID_NDK", 'r10e': "$ANDROID_NDK",
}, },
'build_tools': "23.0.3", 'build_tools': "24.0.0",
'force_build_tools': False, 'force_build_tools': False,
'java_paths': None, 'java_paths': None,
'ant': "ant", 'ant': "ant",

2
makebuildserver
View file

@ -177,6 +177,8 @@ cachefiles = [
'82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'), '82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
('https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip', ('https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip',
'd961663d4a9e128841751c0156548a347c882c081c83942e53788d8949bf34e1'), 'd961663d4a9e128841751c0156548a347c882c081c83942e53788d8949bf34e1'),
('https://dl.google.com/android/repository/build-tools_r24-linux.zip',
'b4871f357224c5f660fd2bbee04d8c7d1c187eeddfd9702cc84503529e3b3724'),
# the binaries that Google uses are here: # the binaries that Google uses are here:
# https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/ # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
('https://services.gradle.org/distributions/gradle-1.4-bin.zip', ('https://services.gradle.org/distributions/gradle-1.4-bin.zip',