mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

gradle: delay calculating some versions

Browse source 
Simplifies the wrapper script.
This commit is contained in:
Daniel Martí 2016-09-15 19:10:18 +01:00
parent 071376b7f4
commit 12653741cc
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
buildserver/gradle
View file

@ -5,9 +5,6 @@ basedir="$(dirname $bindir)"
verdir="${basedir}/versions" verdir="${basedir}/versions"
args=("$@") args=("$@")
v_all=($(cd "${verdir}" && ls | sort -rV))
echo "Available gradle versions: ${v_all[@]}"
run_gradle() { run_gradle() {
"${verdir}/${v_found}/bin/gradle" "${args[@]}" "${verdir}/${v_found}/bin/gradle" "${args[@]}"
exit $? exit $?
@ -29,13 +26,8 @@ d_plugin_v=(2.14.1 2.14.1 2.12 2.12 2.4 2.4 2.3 2.2.1 2.2.1 2.1 2.1 1.12 1.12
# All gradle versions we know about # All gradle versions we know about
plugin_v=(3.0 2.14.1 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) plugin_v=(3.0 2.14.1 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 v_all=${plugin_v[@]}
for v in ${plugin_v[*]}; do echo "Available gradle versions: ${v_all[@]}"
if contains $v "${v_all[*]}"; then
v_def=$v
break
fi
done
# Earliest takes priority # Earliest takes priority
for f in build.gradle ../build.gradle; do for f in build.gradle ../build.gradle; do
@ -72,6 +64,14 @@ if [[ -n $plugin_pver ]]; then
fi fi
fi fi
# Find the highest version available
for v in ${plugin_v[*]}; do
if contains $v "${v_all[*]}"; then
v_def=$v
break
fi
done
if [[ -z $v_found ]]; then if [[ -z $v_found ]]; then
echo "No suitable gradle version found - defaulting to $v_def" echo "No suitable gradle version found - defaulting to $v_def"
v_found=$v_def v_found=$v_def