mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-05 20:20:11 +02:00
Merge branch 'fix_519' into 'master'
Fix 519 Closes #519 See merge request fdroid/fdroidserver!534
This commit is contained in:
commit
449b4ef7a2
@ -35,6 +35,9 @@ download_gradle() {
|
|||||||
echo "Downloading missing gradle version $1"
|
echo "Downloading missing gradle version $1"
|
||||||
if [ -n "${cachedir}" ]; then
|
if [ -n "${cachedir}" ]; then
|
||||||
tmpdir="${cachedir}"
|
tmpdir="${cachedir}"
|
||||||
|
if [ ! -d ${tmpdir} ]; then
|
||||||
|
mkdir -p "${cachedir}"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
tmpdir=$(mktemp -d)
|
tmpdir=$(mktemp -d)
|
||||||
fi
|
fi
|
||||||
@ -126,7 +129,6 @@ d_plugin_v=(4.4 4.1 3.3 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.
|
|||||||
plugin_v=(4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 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=(4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 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)
|
||||||
|
|
||||||
v_all=${plugin_v[@]}
|
v_all=${plugin_v[@]}
|
||||||
echo "Available gradle versions: ${v_all[@]}"
|
|
||||||
|
|
||||||
# Earliest takes priority
|
# Earliest takes priority
|
||||||
for f in {.,..}/gradle/wrapper/gradle-wrapper.properties; do
|
for f in {.,..}/gradle/wrapper/gradle-wrapper.properties; do
|
||||||
|
Loading…
Reference in New Issue
Block a user