diff options
| -rw-r--r-- | config/.bashrc | 5 | ||||
| -rw-r--r-- | config/.tool-versions | 2 | ||||
| -rwxr-xr-x | run.sh | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/config/.bashrc b/config/.bashrc index 288d919..cd1dc74 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -17,6 +17,11 @@ function switch_to() { local version version="$(grep "$tool" "$HOME/.tool-versions"| tr ' ' '\n' | grep "^$major_version")" asdf shell "$tool" "$version" + + if [[ "$tool" = "java" ]]; then + JAVA_HOME="$(asdf which java)" + export 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 @@ -85,9 +85,6 @@ python_version=$(major_version_from "${LM_PYTHON_VERSION:-3}") switch_to python "$python_version" 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 |