Merge pull request #68 from e-kotov/67-support-java-24

add dynamic corretto version check, support java 23, 24 and up

Author: e-kotov

NAMESPACE

@@ -10,6 +10,7 @@ export(java_install)
 export(java_list)
 export(java_quick_install)
 export(java_unpack)
+export(java_valid_versions)
 export(rje_consent)
 export(use_java)
 importFrom(utils,getFromNamespace)

NEWS.md

@@ -2,6 +2,7 @@
 
 ## New features
 
+- `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.
 
 ## Improvements

R/internal_utilities.R

@@ -7,20 +7,22 @@
 platform_detect <- function(quiet = TRUE) {
   sys_info <- tolower(Sys.info())
 
-  os <- switch(sys_info["sysname"],
+  os <- switch(
+    sys_info["sysname"],
     "windows" = "windows",
     "linux" = "linux",
     "darwin" = "macos",
     stop(cli::cli_abort("Unsupported platform"))
   )
 
-  arch <- switch(sys_info["machine"],
+  arch <- switch(
+    sys_info["machine"],
     "x86-64" = "x64",
     "x86_64" = "x64",
     "i386" = "x86",
     "i686" = "x86",
-    "aarch64" = "arm64",
-    "arm64" = "arm64",
+    "aarch64" = "aarch64",
+    "arm64" = "aarch64",
     stop(cli::cli_abort("Unsupported architecture"))
   )
 
@@ -67,7 +69,10 @@ urls_test_all <- function() {
 
         try(
           {
-            response <- curl::curl_fetch_memory(url, handle = curl::new_handle(nobody = TRUE))
+            response <- curl::curl_fetch_memory(
+              url,
+              handle = curl::new_handle(nobody = TRUE)
+            )
             status <- response$status_code
           },
           silent = TRUE
@@ -113,9 +118,18 @@ java_version_check_rscript <- function(java_home) {
       Sys.setenv(PATH = paste(new_path, old_path, sep = .Platform$path.sep))
 
       suppressWarnings(rJava::.jinit())
-      suppressWarnings(java_version <- rJava::.jcall("java.lang.System", "S", "getProperty", "java.version"))
+      suppressWarnings(
+        java_version <- rJava::.jcall(
+          "java.lang.System",
+          "S",
+          "getProperty",
+          "java.version"
+        )
+      )
 
-      message <- cli::format_message("rJava and other rJava/Java-based packages will use Java version: {.val {java_version}}")
+      message <- cli::format_message(
+        "rJava and other rJava/Java-based packages will use Java version: {.val {java_version}}"
+      )
 
       message
     },

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", or 8, 11, 17, 21, or 22.
+#' @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 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.
@@ -31,10 +31,8 @@ java_download <- function(
   force = FALSE,
   temp_dir = FALSE
 ) {
-
   # Download distribution and check MD5 checksum
   download_dist_check_md5 <- function(url, dest_file, quiet) {
-
     curl::curl_download(url, dest_file, quiet = FALSE)
     curl::curl_download(url_md5, dest_file_md5, quiet = TRUE)
 
@@ -45,7 +43,10 @@ java_download <- function(
     md5sum_expected <- readLines(dest_file_md5, warn = FALSE)
 
     if (md5sum != md5sum_expected) {
-      cli::cli_abort("MD5 checksum mismatch. Please try downloading the file again.", .envir = environment())
+      cli::cli_abort(
+        "MD5 checksum mismatch. Please try downloading the file again.",
+        .envir = environment()
+      )
       unlink(dest_file)
       return(NULL)
     } else {
@@ -75,7 +76,10 @@ java_download <- function(
   # Checks for the parameters
   checkmate::check_vector(version, len = 1)
   version <- as.character(version)
-  checkmate::assert_choice(version, getOption("rJavaEnv.valid_major_java_versions"))
+  checkmate::assert_choice(
+    as.character(version),
+    java_valid_versions()
+  )
 
   checkmate::assert_choice(distribution, valid_distributions)
 
@@ -101,15 +105,24 @@ java_download <- function(
   }
 
   if (!distribution %in% names(java_urls)) {
-    cli::cli_abort("Unsupported distribution: {.val {distribution}}", .envir = environment())
+    cli::cli_abort(
+      "Unsupported distribution: {.val {distribution}}",
+      .envir = environment()
+    )
   }
 
   if (!platform %in% names(java_urls[[distribution]])) {
-    cli::cli_abort("Unsupported platform: {.val {platform}}", .envir = environment())
+    cli::cli_abort(
+      "Unsupported platform: {.val {platform}}",
+      .envir = environment()
+    )
   }
 
   if (!arch %in% names(java_urls[[distribution]][[platform]])) {
-    cli::cli_abort("Unsupported architecture: {.val {arch}}", .envir = environment())
+    cli::cli_abort(
+      "Unsupported architecture: {.val {arch}}",
+      .envir = environment()
+    )
   }
 
   url_template <- java_urls[[distribution]][[platform]][[arch]]
@@ -120,17 +133,23 @@ java_download <- function(
   dest_file_md5 <- paste0(file.path(cache_path, basename(url_md5)), ".md5")
 
   if (!quiet) {
-    cli::cli_inform("Downloading Java {version} ({distribution}) for {platform} {arch} to {dest_file}", .envir = environment())
+    cli::cli_inform(
+      "Downloading Java {version} ({distribution}) for {platform} {arch} to {dest_file}",
+      .envir = environment()
+    )
   }
 
   if (file.exists(dest_file) & !force) {
     if (!quiet) {
-      cli::cli_inform("File already exists. Skipping download.", .envir = environment())
+      cli::cli_inform(
+        "File already exists. Skipping download.",
+        .envir = environment()
+      )
     }
-  } else if(file.exists(dest_file) & force) {
+  } else if (file.exists(dest_file) & force) {
     if (!quiet) {
       cli::cli_inform("Removing existing installation.", .envir = environment())
-      }
+    }
     file.remove(dest_file)
     download_dist_check_md5(url, dest_file, quiet)
   } else if (!file.exists(dest_file)) {

R/java_install.R

@@ -2,7 +2,7 @@
 #'
 #' @description
 #' Unpack Java distribution file into cache directory and link the installation into a project directory, optionally setting the `JAVA_HOME` and `PATH` environment variables to the Java version that was just installed.
-#' 
+#'
 #' @param java_distrib_path A `character` vector of length 1 containing the path to the Java distribution file.
 #' @param project_path A `character` vector of length 1 containing the project directory where Java should be installed. If not specified or `NULL`, defaults to the current working directory.
 #' @param autoset_java_env A `logical` indicating whether to set the `JAVA_HOME` and `PATH` environment variables to the installed Java directory. Defaults to `TRUE`.
@@ -13,7 +13,7 @@
 #'
 #' @examples
 #' \dontrun{
-#' 
+#'
 #' # set cache dir to temporary directory
 #' options(rJavaEnv.cache_path = tempdir())
 #' # download, install and autoset environmnet variables for Java 17
@@ -47,12 +47,20 @@ java_install <- function(
   parts <- strsplit(gsub("\\.tar\\.gz|\\.zip", "", filename), "-")[[1]]
 
   # Guess the version, architecture, and platform
-  version <- parts[vapply(parts, function(x) x %in% java_versions, logical(1))][1]
+  version <- parts[vapply(parts, function(x) x %in% java_versions, logical(1))][
+    1
+  ]
   arch <- parts[vapply(parts, function(x) x %in% architectures, logical(1))][1]
   platform <- parts[vapply(parts, function(x) x %in% platforms, logical(1))][1]
 
   # Create a symlink in the project directory
-  project_version_path <- file.path(project_path, "rjavaenv", platform, arch, version)
+  project_version_path <- file.path(
+    project_path,
+    "rjavaenv",
+    platform,
+    arch,
+    version
+  )
   if (!dir.exists(dirname(project_version_path))) {
     dir.create(dirname(project_version_path), recursive = TRUE)
   }
@@ -61,10 +69,14 @@ java_install <- function(
   if (.Platform$OS.type == "windows") {
     try(
       {
-        if( file.exists(project_version_path) ){
+        if (file.exists(project_version_path)) {
           unlink(project_version_path, recursive = TRUE)
         }
-        cmd <- sprintf("mklink /J \"%s\" \"%s\"", gsub("/", "\\\\", project_version_path), gsub("/", "\\\\", installed_path))
+        cmd <- sprintf(
+          "mklink /J \"%s\" \"%s\"",
+          gsub("/", "\\\\", project_version_path),
+          gsub("/", "\\\\", installed_path)
+        )
         result <- tryCatch(
           system2("cmd.exe", args = c("/c", cmd), stdout = TRUE, stderr = TRUE),
           warning = function(w) {
@@ -83,15 +95,24 @@ java_install <- function(
       silent = TRUE
     )
     if (!link_success) {
-      if (!quiet) cli::cli_inform("Junction creation failed. This is likely because the project directory is not on the same disk as the R package cache directory. Java files will instead be copied to {.path {project_version_path}}")
+      if (!quiet)
+        cli::cli_inform(
+          "Junction creation failed. This is likely because the project directory is not on the same disk as the R package cache directory. Java files will instead be copied to {.path {project_version_path}}"
+        )
       dir.create(project_version_path, recursive = TRUE)
-      file.copy(installed_path, project_version_path, recursive = TRUE, overwrite = TRUE)
-      if (!quiet) cli::cli_inform("Java copied to project {.path {project_version_path}}")
+      file.copy(
+        installed_path,
+        project_version_path,
+        recursive = TRUE,
+        overwrite = TRUE
+      )
+      if (!quiet)
+        cli::cli_inform("Java copied to project {.path {project_version_path}}")
     }
   } else {
     tryCatch(
       {
-        if( file.exists(project_version_path) ){
+        if (file.exists(project_version_path)) {
           unlink(project_version_path, recursive = TRUE)
         }
         file.symlink(installed_path, project_version_path)
@@ -102,19 +123,34 @@ java_install <- function(
       error = function(e) {
         if (!quiet) cli::cli_inform("Error: {e}")
         dir.create(project_version_path, recursive = TRUE)
-        file.copy(installed_path, project_version_path, recursive = TRUE, overwrite = TRUE)
-        if (!quiet) cli::cli_inform("Symlink creation failed. Files copied to {.path {project_version_path}}")
+        file.copy(
+          installed_path,
+          project_version_path,
+          recursive = TRUE,
+          overwrite = TRUE
+        )
+        if (!quiet)
+          cli::cli_inform(
+            "Symlink creation failed. Files copied to {.path {project_version_path}}"
+          )
       }
     )
   }
 
-
-
   # Write the JAVA_HOME to the .Rprofile and environment after installation
   if (autoset_java_env) {
-    java_env_set(installed_path, where = "both", quiet = quiet, project_path = project_path)
+    java_env_set(
+      installed_path,
+      where = "both",
+      quiet = quiet,
+      project_path = project_path
+    )
   }
 
-  if (!quiet) cli::cli_inform("Java {version} ({filename}) for {platform} {arch} installed at {.path {installed_path}} and symlinked to {.path {project_version_path}}", .envir = environment())
+  if (!quiet)
+    cli::cli_inform(
+      "Java {version} ({filename}) for {platform} {arch} installed at {.path {installed_path}} and symlinked to {.path {project_version_path}}",
+      .envir = environment()
+    )
   return(installed_path)
 }