Force usage of a specific JDK version on macOS

misl6 · Nov 19, 2023 · 7438542 · 7438542
1 parent cd3fed4
commit 7438542
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/pythonforandroid/prerequisites.py b/pythonforandroid/prerequisites.py
@@ -151,7 +151,7 @@ class JDKPrerequisite(Prerequisite):
     name = "JDK"
     mandatory = dict(linux=False, darwin=True)
     installer_is_supported = dict(linux=False, darwin=True)
-    min_supported_version = 17
+    supported_version = 17
 
     def darwin_checker(self):
         if "JAVA_HOME" in os.environ:
@@ -197,21 +197,21 @@ def _darwin_jdk_is_supported(self, jdk_path):
         res = _stdout_res.strip().decode()
 
         major_version = int(res.split(" ")[-1].split(".")[0])
-        if major_version >= self.min_supported_version:
+        if major_version == self.supported_version:
             info(f"Found a valid JDK at {jdk_path}")
             return True
         else:
-            error(f"JDK {self.min_supported_version} or higher is required")
+            error(f"JDK version {major_version} is not supported")
             return False
 
     def darwin_helper(self):
         info(
-            "python-for-android requires a JDK 17 or higher to be installed on macOS,"
+            "python-for-android requires a JDK {self.supported_version} to be installed on macOS,"
             "but seems like you don't have one installed."
         )
         info(
             "If you think that a valid JDK is already installed, please verify that "
-            "you have a JDK 17 or higher installed and that `/usr/libexec/java_home` "
+            "you have a JDK {self.supported_version} installed and that `/usr/libexec/java_home` "
             "shows the correct path."
         )
         info(
@@ -221,12 +221,12 @@ def darwin_helper(self):
 
     def darwin_installer(self):
         info(
-            "Looking for a JDK 17 or higher installation which is not the default one ..."
+            "Looking for a JDK {self.supported_version} installation which is not the default one ..."
         )
-        jdk_path = self._darwin_get_libexec_jdk_path(version="17+")
+        jdk_path = self._darwin_get_libexec_jdk_path(version=self.supported_version)
 
         if not self._darwin_jdk_is_supported(jdk_path):
-            info("We're unlucky, there's no JDK 17 or higher installation available")
+            info(f"We're unlucky, there's no JDK {self.supported_version} or higher installation available")
 
             base_url = "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/"
             if platform.machine() == "arm64":