From 5de1057488337e495717b08aae6bb9dc45cb74f9 Mon Sep 17 00:00:00 2001
From: eugene yokota <eed3si9n@gmail.com>
Date: Tue, 21 Apr 2026 23:40:39 -0400
Subject: [PATCH] [2.0.x] hide JDK warnings if JDK 26 or later (#9119)

Co-authored-by: kenji yoshida <6b656e6a69@gmail.com>
---
 sbt                                 | 2 +-
 sbtw/src/main/scala/sbtw/Main.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbt b/sbt
index 13aac114a..bba447c95 100755
--- a/sbt
+++ b/sbt
@@ -361,7 +361,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 bf68af4fe..206bb7d09 100644
--- a/sbtw/src/main/scala/sbtw/Main.scala
+++ b/sbtw/src/main/scala/sbtw/Main.scala
@@ -83,7 +83,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"