Skip to content

Enable support for internal jdk #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hamlin-Li wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable support for internal jdk #379

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e12088e
Enable support for internal jdk
Oct 18, 2023
664deda
Fix regex matching -ea|-internal
Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ getJavaVersion() {
if [[ "$str" =~ ^1\.([0-9]+)(\..*)?$ ]]; then
echo "${BASH_REMATCH[1]}"
# Fixes https://github.com/dwijnand/sbt-extras/issues/326
elif [[ "$str" =~ ^([0-9]+)(\..*)?(-ea)?$ ]]; then
# Fixes https://github.com/dwijnand/sbt-extras/issues/378
elif [[ "$str" =~ ^([0-9]+)(\..*)?-(ea|internal)?$ ]]; then

@luben luben Oct 20, 2023

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be ^([0-9]+)(\..*)?(-ea|-internal)?$?

@Hamlin-Li Hamlin-Li Oct 23, 2023

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

echo "${BASH_REMATCH[1]}"
elif [[ -n "$str" ]]; then
echoerr "Can't parse java version from: $str"
Expand Down