diff options
| author | mo khan <mo.khan@gmail.com> | 2020-04-20 13:17:05 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-04-20 13:17:05 +0000 |
| commit | 0d268993b9416e7c9756cfc2298dba35ef913ed5 (patch) | |
| tree | 3ac8be01834cd7f4d5e38c4065c9d60ee8c34318 /config | |
| parent | 222af4bf77171fb4b9fb33e6e42dcd32dbf19d54 (diff) | |
| parent | 0d2701caaa74eeaa62c18b4f9fee157c56208c2b (diff) | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/.bashrc | 13 | ||||
| -rw-r--r-- | config/.tool-versions | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/config/.bashrc b/config/.bashrc index 288d919..9c463dd 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -11,12 +11,25 @@ function inflate() { fi } +update_java_home() { + local java_path + java_path="$(asdf which java)" + if [[ -n "${java_path}" ]]; then + export JAVA_HOME + JAVA_HOME="$(dirname "$(dirname "$(realpath "${java_path}")")")" + fi +} + function switch_to() { local tool=$1 local major_version=$2 local version version="$(grep "$tool" "$HOME/.tool-versions"| tr ' ' '\n' | grep "^$major_version")" asdf shell "$tool" "$version" + + if [[ "$tool" = "java" ]]; then + update_java_home + fi } function major_version_from() { diff --git a/config/.tool-versions b/config/.tool-versions index 92ddb32..9803064 100644 --- a/config/.tool-versions +++ b/config/.tool-versions @@ -1,7 +1,7 @@ elixir system golang system gradle 6.3 -java adopt-openjdk-8u242-b08 adopt-openjdk-11.0.6+10 +java adopt-openjdk-8u242-b08 adopt-openjdk-11.0.7+10 maven 3.6.3 nodejs 10.19.0 php 7.4.4 |