mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-14 15:02:51 +03:00
Properly default to the highest version of gradle
This commit is contained in:
parent
fa0f9bf1af
commit
7f1acadaf1
1 changed files with 12 additions and 1 deletions
|
@ -9,7 +9,6 @@ pushd "${verdir}" &>/dev/null
|
||||||
v_all=(*/)
|
v_all=(*/)
|
||||||
v_all=(${v_all[@]%/})
|
v_all=(${v_all[@]%/})
|
||||||
|
|
||||||
v_def=${v_all[-1]}
|
|
||||||
echo "Available gradle versions: ${v_all[@]}"
|
echo "Available gradle versions: ${v_all[@]}"
|
||||||
|
|
||||||
popd &>/dev/null
|
popd &>/dev/null
|
||||||
|
@ -19,11 +18,23 @@ run_gradle() {
|
||||||
exit $?
|
exit $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
contains() {
|
||||||
|
local e
|
||||||
|
for e in $2; do
|
||||||
|
[[ $e == $1 ]] && return 0;
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
# 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.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2)
|
d_plugin_k=( 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2)
|
||||||
d_plugin_v=(1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
|
d_plugin_v=(1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
|
||||||
|
|
||||||
|
for v in ${d_plugin_v}; do
|
||||||
|
contains $v "${v_all[*]}" && v_def=$v && break
|
||||||
|
done
|
||||||
|
|
||||||
# Latest takes priority
|
# Latest takes priority
|
||||||
for f in ../build.gradle build.gradle; do
|
for f in ../build.gradle build.gradle; do
|
||||||
[[ -f $f ]] || continue
|
[[ -f $f ]] || continue
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue