mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-06 01:11:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add gradle 2.2.1 for plugin versions 1.0.X

Browse source
This commit is contained in:
Daniel Martí 2014-12-12 12:29:16 +01:00
parent 3aaa5c9603
commit 05a7a872b6
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/cookbooks/gradle/recipes/default.rb
View file

@ -18,7 +18,7 @@ script "add-gradle-verdir" do
not_if "test -d /opt/gradle/versions" not_if "test -d /opt/gradle/versions"
end end
%w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12 2.1}.each do |ver| %w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12 2.1 2.2.1}.each do |ver|
script "install-gradle-#{ver}" do script "install-gradle-#{ver}" do
cwd "/tmp" cwd "/tmp"
interpreter "bash" interpreter "bash"

9
buildserver/cookbooks/gradle/recipes/gradle
View file

@ -5,11 +5,11 @@ basedir="$(dirname $bindir)"
verdir="${basedir}/versions" verdir="${basedir}/versions"
args=("$@") args=("$@")
v_all=($(cd ${verdir} && ls | sort -rV)) v_all=($(cd "${verdir}" && ls | sort -rV))
echo "Available gradle versions: ${v_all[@]}" echo "Available gradle versions: ${v_all[@]}"
run_gradle() { run_gradle() {
${verdir}/${v_found}/bin/gradle "${args[@]}" "${verdir}/${v_found}/bin/gradle" "${args[@]}"
exit $? exit $?
} }
@ -23,9 +23,10 @@ contains() {
# key-value pairs of what gradle version each gradle plugin version # key-value pairs of what gradle version each gradle plugin version
# should accept # should accept
d_plugin_k=(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_k=( 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.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_v=(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)
# Find the highest version available
for v in ${d_plugin_v}; do for v in ${d_plugin_v}; do
if contains $v "${v_all[*]}"; then if contains $v "${v_all[*]}"; then
v_def=$v v_def=$v

3
makebuildserver
View file

@ -92,6 +92,9 @@ cachefiles = [
('gradle-2.1-bin.zip', ('gradle-2.1-bin.zip',
'https://services.gradle.org/distributions/gradle-2.1-bin.zip', 'https://services.gradle.org/distributions/gradle-2.1-bin.zip',
'3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878'), '3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878'),
('gradle-2.2.1-bin.zip',
'https://services.gradle.org/distributions/gradle-2.2.1-bin.zip',
'420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'),
('Kivy-1.7.2.tar.gz', ('Kivy-1.7.2.tar.gz',
'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz', 'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
'0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'), '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),