Fix remaining OpenJDK-25-related issues

* Relax version digit length checks.
* Handle wonky JVM paths on macOS.
* Fix typo.

Author: ctrueden

src/scyjava/_cjdk_fetch.py

@@ -47,7 +47,7 @@ def _silent_check_output(*args, **kwargs):
     try:
         with patch.object(subprocess, "check_output", new=_silent_check_output):
             jpype.getDefaultJVMPath()
-    # on Darwin, may raise a CalledProcessError when invoking `/user/libexec/java_home`
+    # on Darwin, may raise a CalledProcessError when invoking `/usr/libexec/java_home`
     except (jpype.JVMNotFoundException, subprocess.CalledProcessError):
         return False
     return True

src/scyjava/_jvm.py

@@ -70,8 +70,14 @@ def jvm_version() -> tuple[int, ...]:
     default_jvm_path = jpype.getDefaultJVMPath()
     if not default_jvm_path:
         raise RuntimeError("Cannot glean the default JVM path")
+    print(f"Default JVM path from JPype: {default_jvm_path}")
 
-    p = Path(default_jvm_path)
+    # Good ol' macOS! Nothing beats macOS.
+    jvm_path = default_jvm_path.replace(
+        "/Contents/MacOS/libjli.dylib", "/Contents/Home/lib/libjli.dylib"
+    )
+
+    p = Path(jvm_path)
     if not p.exists():
         raise RuntimeError(f"Invalid default JVM path: {p}")
 

tests/it/jvm_version.py

@@ -10,15 +10,15 @@
 
 before_version = scyjava.jvm_version()
 assert_that(before_version).is_not_none()
-assert_that(len(before_version)).is_greater_than_or_equal_to(3)
+assert_that(len(before_version)).is_greater_than_or_equal_to(1)
 assert_that(before_version[0]).is_greater_than(0)
 
 scyjava.config.enable_headless_mode()
 scyjava.start_jvm()
 
 after_version = scyjava.jvm_version()
 assert_that(after_version).is_not_none()
-assert_that(len(after_version)).is_greater_than_or_equal_to(3)
+assert_that(len(after_version)).is_greater_than_or_equal_to(1)
 assert_that(after_version[0]).is_greater_than(0)
 
 assert_that(before_version).is_equal_to(after_version)