diff --git a/sbt b/sbt index c32343fe0..3631d4ead 100755 --- a/sbt +++ b/sbt @@ -362,7 +362,7 @@ addSbtScriptProperty () { } addJdkWorkaround () { - local is_25="$(expr $java_version "=" 25)" + local is_25="$(expr $java_version ">=" 25)" if [[ "$hide_jdk_warnings" == "0" ]]; then : else diff --git a/sbtw/src/main/scala/sbtw/Main.scala b/sbtw/src/main/scala/sbtw/Main.scala index 3efeb8d28..59d13a3e8 100644 --- a/sbtw/src/main/scala/sbtw/Main.scala +++ b/sbtw/src/main/scala/sbtw/Main.scala @@ -85,7 +85,7 @@ object Main: else Memory.addDefaultMemory(javaOpts, sbtOpts, javaVer, LauncherOptions.defaultMemMb) sbtOpts = finalSbt - if !opts.noHideJdkWarnings && javaVer == 25 then + if !opts.noHideJdkWarnings && javaVer >= 25 then sbtOpts = sbtOpts ++ Seq( "--sun-misc-unsafe-memory-access=allow", "--enable-native-access=ALL-UNNAMED"