From 172953e7b7741acd3bc0ec09acd2b7c54f568666 Mon Sep 17 00:00:00 2001
From: Jeremy Dormitzer <jdormitzer@spotify.com>
Date: Mon, 11 Apr 2022 17:21:06 -0400
Subject: [PATCH] Use manual JAVA_HOME setting instead of SDKMAN to manage jvm
 version

---
 zsh/.zprofile | 1 +
 zsh/.zshenv   | 4 ----
 zsh/.zshrc    | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/zsh/.zprofile b/zsh/.zprofile
index bbc48ab..e932add 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -4,5 +4,6 @@ if [[ -f "/opt/homebrew/bin/brew" ]]; then
 fi
 export PATH="$PATH:/Users/jdormit/.local/bin"
 eval "$(pyenv init --path)"
+[[ -d "/opt/homebrew/opt/openjdk@17" ]] && export JAVA_HOME="/opt/homebrew/opt/openjdk@17"
 export SYSTEM_VERSION_COMPAT=1
 ulimit -n 524288
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 1023e3f..9d61e1b 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -28,8 +28,4 @@ if [ -d "/opt/homebrew/Caskroom/google-cloud-sdk" ]; then
     source "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc"
 fi
 
-#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
-export SDKMAN_DIR="$HOME/.sdkman"
-[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
-path=("$SDKMAN_DIR/candidates/java/current/bin" "$path[@]")
 [[ -e "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 36bedd2..3fd85b9 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -175,6 +175,4 @@ vterm_prompt_end() {
 setopt PROMPT_SUBST
 PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'
 
-path=("$SDKMAN_DIR/candidates/java/current/bin" "$path[@]")
-
 [[ -f "$HOME/.zshrc-spotify" ]] && source "$HOME/.zshrc-spotify"