Merge branch '211688-gradle' into 'master'v3.7.2

Use GRADLE_CLI_OPTS during `gradle downloadLicenses` task.

See merge request gitlab-org/security-products/license-management!121

1 files changed, 10 insertions, 15 deletions

diff --git a/run.sh b/run.sh
index cfe19fc..b061f92 100755
--- a/run.sh
+++ b/run.sh
@@ -63,43 +63,38 @@ function prepare_javascript() {
   fi
 }
 
-function prepare_java() {
-  [[ -f build.gradle ]] && [[ ! -f gradlew ]] && \
-    gradle build ${GRADLE_CLI_OPTS:+-x test}
-}
-
 function prepare_dotnet() {
   [[ $(ls ./*.sln 2> /dev/null) ]] && RECURSIVE="--recursive"
 }
 
+function prepare_tools() {
+  if ! asdf current 2> >(grep -q 'is not installed'); then
+    echo "Installing missing tools…"
+    asdf install > /dev/null 2>&1
+  fi
+}
+
 function prepare_project() {
   if [[ -z ${SETUP_CMD:-} ]]; then
-    asdf install 1> /dev/null
-
+    prepare_tools || true
     prepare_javascript || true
-    prepare_java || true
     prepare_dotnet || true
   else
-    echo "Running '${SETUP_CMD}' to install project dependencies..."
+    echo "Running '${SETUP_CMD}' to install project dependencies…"
     # shellcheck disable=SC2068
     ${SETUP_CMD[@]}
     PREPARE="--no-prepare"
   fi
 }
 
-python_version=$(major_version_from "${LM_PYTHON_VERSION:-3}")
-switch_to python "$python_version"
+switch_to python "$(major_version_from "${LM_PYTHON_VERSION:-3}")"
 switch_to java "adopt-openjdk-${LM_JAVA_VERSION:-8}"
 
-# shellcheck source=/dev/null
-. "$ASDF_DATA_DIR/plugins/java/set-java-home.sh"
-
 prepare_project
 [[ $CI_DEBUG_TRACE == 'true' ]] && debug_env
 
 scan_project "$PREPARE" \
   --format=json \
   --save="${LM_REPORT_FILE}" \
-  --python-version="${python_version}" \
   "$RECURSIVE" \
   "$LICENSE_FINDER_CLI_OPTS"