mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-06 15:30:28 +03:00
Merge branch 'api-24' into 'master'
Api 24, gradle versions CC @krt @eighthave See merge request !140
This commit is contained in:
commit
1210dc7769
5 changed files with 12 additions and 4 deletions
|
|
@ -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.3;
|
||||
echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-24.0.0;
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
|
||||
sudo apt-get -q update -y;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ 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
|
|||
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.13 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)
|
||||
plugin_v=(2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 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
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
# }
|
||||
|
||||
# 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
|
||||
# builds without having all of the possible build-tools installed.
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ default_config = {
|
|||
'r9b': None,
|
||||
'r10e': "$ANDROID_NDK",
|
||||
},
|
||||
'build_tools': "23.0.3",
|
||||
'build_tools': "24.0.0",
|
||||
'force_build_tools': False,
|
||||
'java_paths': None,
|
||||
'ant': "ant",
|
||||
|
|
|
|||
|
|
@ -133,6 +133,8 @@ cachefiles = [
|
|||
'45eb581bbe53c9256f34c26b2cea919543c0079140897ac721cf88c0b9f6789e'),
|
||||
('https://dl.google.com/android/repository/platform-23_r03.zip',
|
||||
'4b4bcddead3319708275c54c76294707bfaa953d767e34f1a5b599f3edd0076c'),
|
||||
('https://dl.google.com/android/repository/platform-24_r01.zip',
|
||||
'292e556e9ec84b4134e4126c835e4ac467f6950924fec3684792af0fcf426091'),
|
||||
('https://dl.google.com/android/repository/build-tools_r17-linux.zip',
|
||||
'4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
|
||||
('https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
|
||||
|
|
@ -177,6 +179,8 @@ cachefiles = [
|
|||
'82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
|
||||
('https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip',
|
||||
'd961663d4a9e128841751c0156548a347c882c081c83942e53788d8949bf34e1'),
|
||||
('https://dl.google.com/android/repository/build-tools_r24-linux.zip',
|
||||
'b4871f357224c5f660fd2bbee04d8c7d1c187eeddfd9702cc84503529e3b3724'),
|
||||
# the binaries that Google uses are here:
|
||||
# https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
|
||||
('https://services.gradle.org/distributions/gradle-1.4-bin.zip',
|
||||
|
|
@ -197,6 +201,8 @@ cachefiles = [
|
|||
'8734b13a401f4311ee418173ed6ca8662d2b0a535be8ff2a43ecb1c13cd406ea'),
|
||||
('https://services.gradle.org/distributions/gradle-2.1-bin.zip',
|
||||
'3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878'),
|
||||
('https://services.gradle.org/distributions/gradle-2.2-bin.zip',
|
||||
'91e5655fe11ef414449f218c4fa2985b3a49b7903c57556da109c84fa26e1dfb'),
|
||||
('https://services.gradle.org/distributions/gradle-2.2.1-bin.zip',
|
||||
'420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'),
|
||||
('https://services.gradle.org/distributions/gradle-2.3-bin.zip',
|
||||
|
|
@ -221,6 +227,8 @@ cachefiles = [
|
|||
'e77064981906cd0476ff1e0de3e6fef747bd18e140960f1915cca8ff6c33ab5c'),
|
||||
('https://services.gradle.org/distributions/gradle-2.13-bin.zip',
|
||||
'0f665ec6a5a67865faf7ba0d825afb19c26705ea0597cec80dd191b0f2cbb664'),
|
||||
('https://services.gradle.org/distributions/gradle-2.14-bin.zip',
|
||||
'993b4f33b652c689e9721917d8e021cab6bbd3eae81b39ab2fd46fdb19a928d5'),
|
||||
('https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
|
||||
'0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue