Merge pull request #70 from e-kotov/macos-corretto-versions-warning

platform dependent fallback java versions, automatic detection for current platform option

Author: e-kotov

CITATION.cff

@@ -35,6 +35,10 @@ authors:
   given-names: Egor
   email: [email protected]
   orcid: https://orcid.org/0000-0001-6690-5345
+- family-names: Chan
+  given-names: Chung-hong
+  email: [email protected]
+  orcid: https://orcid.org/0000-0002-6232-7530
 preferred-citation:
   type: manual
   title: 'rJavaEnv: Java Environments for R Projects'

DESCRIPTION

@@ -4,6 +4,8 @@ Version: 0.2.2.9000
 Authors@R: c(
     person("Egor", "Kotov", , "[email protected]", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0001-6690-5345")),
+    person("Chung-hong", "Chan", , "[email protected]", role = "aut",
+           comment = c(ORCID = "0000-0002-6232-7530")),
     person("Mauricio", "Vargas", , "[email protected]", role = "ctb",
            comment = c(ORCID = "0000-0003-1017-7574")),
     person("Hadley", "Wickham", , "[email protected]", role = "ctb",

NEWS.md

@@ -4,6 +4,7 @@
 
 - `Java` version (currently still only for `Amazon Corretto`) is now determined dynamically using the official GitHub `json` with releases, so when new `Java` version becomes available, you will not be depenent on `rJavaEnv` to be updated. As a fallback, versions up to 24 are hardcoded.
 - `force` argument in `java_download()`. When set to `TRUE`, allows to overwrite the distribution file if it already exist in the cache.
+- new function `java_valid_versions()` allows to retrieve a list of all available `Java` versions for the current automatically detected OS and CPU architecture, or user-specified platform and architecture.
 
 ## Improvements
 

R/internal_utilities.R

@@ -20,6 +20,8 @@ platform_detect <- function(quiet = TRUE) {
     "x86-64" = "x64",
     "x86_64" = "x64",
     "i386" = "x86",
+    "i486" = "x86",
+    "i586" = "x86",
     "i686" = "x86",
     "aarch64" = "aarch64",
     "arm64" = "aarch64",

R/java_download.R

@@ -1,6 +1,6 @@
 #' Download a Java distribution
 #'
-#' @param version `Integer` or `character` vector of length 1 for major version of Java to download or install. If not specified, defaults to the latest LTS version. Can be "8", "11", "17", "21", "22", "23", "24", or 8, 11, 17, 21, 22, 23, 24 or any newer version if it is available for the selected distribution.
+#' @param version `Integer` or `character` vector of length 1 for major version of Java to download or install. If not specified, defaults to the latest LTS version. Can be "8", and "11" to "24" (or the same version numers in `integer`) or any newer version if it is available for the selected distribution. For `macOS` on `aarch64` architecture (Apple Silicion) certain `Java` versions are not available.
 #' @param distribution The Java distribution to download. If not specified, defaults to "Amazon Corretto". Currently only \href{https://aws.amazon.com/corretto/}{"Amazon Corretto"} is supported.
 #' @param cache_path The destination directory to download the Java distribution to. Defaults to a user-specific data directory.
 #' @param platform The platform for which to download the Java distribution. Defaults to the current platform.
@@ -78,7 +78,11 @@ java_download <- function(
   version <- as.character(version)
   checkmate::assert_choice(
     as.character(version),
-    java_valid_versions()
+    java_valid_versions(
+      distribution = distribution,
+      platform = platform,
+      arch = arch
+    )
   )
 
   checkmate::assert_choice(distribution, valid_distributions)

R/java_valid_versions.R

@@ -4,8 +4,8 @@
 #' The result is cached for 8 hours to avoid repeated API calls. If the API call fails (for example, due to a lack of internet connectivity),
 #' the function falls back to a pre-defined list of Java versions.
 #'
-#' @param distribution Character. The Java distribution to use. If set to `"Oracle"`, the Oracle API is used.
-#'   If set to `"Corretto"` (the default), an Amazon Corretto endpoint is used.
+#' @inheritParams java_download
+#'
 #' @param force Logical. If TRUE, forces a fresh API call even if a cached value exists. Defaults to FALSE.
 #'
 #' @return A character vector of valid Java versions.
@@ -23,6 +23,8 @@
 #'
 java_valid_versions <- function(
   distribution = "Corretto",
+  platform = platform_detect()$os,
+  arch = platform_detect()$arch,
   force = FALSE
 ) {
   # Define cache expiry time (in hours)
@@ -51,7 +53,10 @@ java_valid_versions <- function(
   new_versions <- switch(
     distribution,
     # "Oracle" = java_valid_versions_oracle(),
-    "Corretto" = java_valid_major_versions_corretto(),
+    "Corretto" = java_valid_major_versions_corretto(
+      platform = platform,
+      arch = arch
+    ),
     stop("Unsupported distribution")
   )
 
@@ -76,8 +81,7 @@ java_valid_versions <- function(
 #'   If \code{NULL}, it is inferred using \code{platform_detect()}.
 #' @param platform Optional character string for the operating system (e.g., "windows", "macos", "linux").
 #'   If \code{NULL}, it is inferred using \code{platform_detect()}.
-#' @param imageType Optional character string to filter on; defaults to \code{"jdk"}.
-#' @param extension Optional character string specifying the desired file extension; defaults to \code{"tar.gz"}.
+#' @param imageType Optional character string to filter on; defaults to \code{"jdk"}. Can be set to \code{"jre"} for Windows Java Runtime Environment.
 #'
 #' @return A `character` vector of available major Corretto versions.
 #'
@@ -86,8 +90,7 @@ java_valid_versions <- function(
 java_valid_major_versions_corretto <- function(
   arch = NULL,
   platform = NULL,
-  imageType = "jdk",
-  extension = "tar.gz"
+  imageType = "jdk"
 ) {
   # If platform or arch are not provided, detect them using the existing function.
   if (is.null(platform) || is.null(arch)) {
@@ -112,7 +115,8 @@ java_valid_major_versions_corretto <- function(
       names(eligible)
     },
     error = function(e) {
-      getOption("rJavaEnv.fallback_valid_versions")
+      platform_arch <- paste(platform, arch, sep = "_")
+      getOption(paste0("rJavaEnv.fallback_valid_versions_", platform_arch))
     }
   )
 
@@ -134,7 +138,7 @@ java_valid_major_versions_corretto <- function(
 #     },
 #     error = function(e) {
 #       # If the API call fails, use the fallback list stored in options.
-#       getOption("rJavaEnv.fallback_valid_versions")
+#       getOption("rJavaEnv.fallback_valid_versions_current_platform")
 #     }
 #   )
 # }

R/onLoad.R

@@ -1,17 +1,15 @@
 .onLoad <- function(libname, pkgname) {
+  # First, set all the base rJavaEnv options
   op <- options()
   op.rJavaEnv <- list(
-    # this default folder choice is in-line with what renv package does
-    # https://github.com/rstudio/renv/blob/d6bced36afa0ad56719ca78be6773e9b4bbb078f/R/bootstrap.R#L940-L950
+    # Default folder choice (in line with renv package)
     rJavaEnv.cache_path = tools::R_user_dir("rJavaEnv", which = "cache"),
     rJavaEnv.valid_versions_cache = NULL,
     rJavaEnv.valid_versions_timestamp = NULL,
-    # Fallback list of valid Java versions if the API call fails (e.g., no internet) as of 2025-04-02
-    rJavaEnv.fallback_valid_versions = c(
+    # Fallback lists for various platforms
+    rJavaEnv.fallback_valid_versions_macos_aarch64 = c(
       "8",
       "11",
-      # "15", # not available from Amazon Corretto
-      # "16", # not available from Amazon Corretto
       "17",
       "18",
       "19",
@@ -20,10 +18,90 @@
       "22",
       "23",
       "24"
+    ),
+    rJavaEnv.fallback_valid_versions_macos_x64 = c(
+      "8",
+      "11",
+      "15",
+      "16",
+      "17",
+      "18",
+      "19",
+      "20",
+      "21",
+      "22",
+      "23",
+      "24"
+    ),
+    rJavaEnv.fallback_valid_versions_linux_aarch64 = c(
+      "8",
+      "11",
+      "15",
+      "16",
+      "17",
+      "18",
+      "19",
+      "20",
+      "21",
+      "22",
+      "23",
+      "24"
+    ),
+    rJavaEnv.fallback_valid_versions_linux_x64 = c(
+      "8",
+      "11",
+      "15",
+      "16",
+      "17",
+      "18",
+      "19",
+      "20",
+      "21",
+      "22",
+      "23",
+      "24"
+    ),
+    rJavaEnv.fallback_valid_versions_windows_x64 = c(
+      "8",
+      "11",
+      "15",
+      "16",
+      "17",
+      "18",
+      "19",
+      "20",
+      "21",
+      "22",
+      "23",
+      "24"
+    ),
+    rJavaEnv.fallback_valid_versions_windows_x86 = c(
+      "8",
+      "11"
     )
   )
+
+  # Only set the options that haven't been defined yet
   toset <- !(names(op.rJavaEnv) %in% names(op))
   if (any(toset)) options(op.rJavaEnv[toset])
 
+  # Now, detect the current platform (OS and architecture)
+  platform <- platform_detect(quiet = TRUE)
+
+  # Build the option name dynamically based on platform$os and platform$arch.
+  # For example, for macOS on x64, this results in "rJavaEnv.fallback_valid_versions_macos_x64"
+  fallback_option_name <- paste0(
+    "rJavaEnv.fallback_valid_versions_",
+    platform$os,
+    "_",
+    platform$arch
+  )
+
+  # Retrieve the corresponding fallback list using getOption()
+  fallback_current <- getOption(fallback_option_name)
+
+  # Set the current platform valid versions option
+  options(rJavaEnv.fallback_valid_versions_current_platform = fallback_current)
+
   invisible()
 }

README.qmd

@@ -167,7 +167,10 @@ The package has several core functions:
 9. `java_clear()`
    * Removes all or some `Java` versions linked in the current project (or cached distributions or installations).
 
-10. `use_java()`
+10 `java_valid_versions()`
+   * Lists all valid major `Java` versions that can be downloaded and installed for either current automatically detected OS and CPU architecture or user-specified platform and architecture.
+
+11. `use_java()`
    * Same as `java_quick_install()`, but in a less intrusive way. Does not copy or link the `Java` installation folder from cache into the project directory and does not create or edit your `.Rprofile` file. Only sets requested java in the current R session.
 
 See more details on all the functions in the [Reference](https://www.ekotov.pro/rJavaEnv/reference/index.html){target="_blank"}.

codemeta.json

@@ -28,6 +28,13 @@
       "familyName": "Kotov",
       "email": "[email protected]",
       "@id": "https://orcid.org/0000-0001-6690-5345"
+    },
+    {
+      "@type": "Person",
+      "givenName": "Chung-hong",
+      "familyName": "Chan",
+      "email": "[email protected]",
+      "@id": "https://orcid.org/0000-0002-6232-7530"
     }
   ],
   "contributor": [
@@ -178,7 +185,7 @@
     },
     "SystemRequirements": null
   },
-  "fileSize": "351771.806KB",
+  "fileSize": "351785.837KB",
   "citation": [
     {
       "@type": "SoftwareSourceCode",

inst/schemaorg.json

@@ -3,9 +3,18 @@
   "@graph": [
     {
       "type": "SoftwareSourceCode",
-      "author": {
-        "id": "https://orcid.org/0000-0001-6690-5345"
-      },
+      "author": [
+        {
+          "id": "https://orcid.org/0000-0002-6232-7530",
+          "type": "Person",
+          "email": "[email protected]",
+          "familyName": "Chan",
+          "givenName": "Chung-hong"
+        },
+        {
+          "id": "https://orcid.org/0000-0001-6690-5345"
+        }
+      ],
       "codeRepository": "https://github.com/e-kotov/rJavaEnv",
       "contributor": [
         {