From 1b395c6c682a530a352675c3011c7714515931d7 Mon Sep 17 00:00:00 2001 From: david Date: Sun, 12 May 2024 08:48:01 +0200 Subject: [PATCH] Feature: Remove jvm-impl choice since Adoptium only offers hotspot impl --- warp4j | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/warp4j b/warp4j index db73d31..2e257ef 100755 --- a/warp4j +++ b/warp4j @@ -37,8 +37,6 @@ function print_help { echo ' --windows create binary for Windows' echo ' if no targets are specified then binaries for' echo ' all targets are created' - echo ' --jvm-impl jvm implementation: hotspot or openj9' - echo ' (default: hotspot)' echo ' --jvm-options ' echo ' passed to java like this:' echo ' "java -jar ";' @@ -147,10 +145,6 @@ while [[ $# -gt 0 ]]; do TARGETS+=($WIN) shift ;; - --jvm-impl) - JVM_IMPL="$2" - shift 2 - ;; --jvm-options) JVM_OPTIONS="$2" shift 2 @@ -231,22 +225,13 @@ if [[ $JAVA_VERSION ]] && ! java_version_is_correct $JAVA_VERSION ; then fail_with "JDK version \"$JAVA_VERSION\" is not correct" fi -JVM_IMPL_HOTSPOT=hotspot -JVM_IMPL_OPENJ9=openj9 - -# validate jvm implementation -if [[ $JVM_IMPL ]] && - [[ $JVM_IMPL != $JVM_IMPL_HOTSPOT ]] && - [[ $JVM_IMPL != $JVM_IMPL_OPENJ9 ]]; then - fail_with "jvm implementation \"$JVM_IMPL\" is not correct" -fi +JVM_IMPL=hotspot LATEST_LTS=17 # latest LTS java branch # default options test -z $JAVA_VERSION && JAVA_VERSION=$LATEST_LTS test -z $TARGETS && TARGETS=($LIN $MAC $WIN) -test -z $JVM_IMPL && JVM_IMPL=$JVM_IMPL_HOTSPOT # returns java branch version function get_base_version() { -- 2.45.2