Merge pull request #264 from JuliaInterop/fix-macos-arm-compatibility

Fix macOS ARM compatibility issues

Author: ViralBShah

DESCRIPTION

@@ -27,13 +27,14 @@ Imports: utils,
     Rcpp (>= 0.12.7),
     knitr (>= 1.28),
     rjson
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.3
 LinkingTo: Rcpp
 NeedsCompilation: yes
 ByteCompile: yes
 SystemRequirements: Julia >= 1.0.0, RCall.jl
 Suggests: testthat,
     rmarkdown,
     rappdirs,
-    sass
+    sass,
+    curl
 VignetteBuilder: knitr

NAMESPACE

@@ -69,7 +69,9 @@ export(julia_help)
 export(julia_install_package)
 export(julia_install_package_if_needed)
 export(julia_installed_package)
+export(julia_latest_version)
 export(julia_library)
+export(julia_lts_version)
 export(julia_markdown_setup)
 export(julia_notebook_setup)
 export(julia_pkg_hook)

R/installJulia.R

@@ -11,6 +11,10 @@ julia_default_install_dir <- function(){
     return(dir)
 }
 
+#' Get the latest stable Julia version.
+#'
+#' @return A numeric_version object representing the latest stable Julia version.
+#' @export
 julia_latest_version <- function(){
     url <- "https://julialang-s3.julialang.org/bin/versions.json"
     file <- tempfile()
@@ -20,6 +24,26 @@ julia_latest_version <- function(){
     max(numeric_version(names(Filter(function(v) v$stable, versions))))
 }
 
+#' Get the latest Long Term Support (LTS) Julia version.
+#'
+#' @return A numeric_version object representing the latest LTS Julia version.
+#' @export
+julia_lts_version <- function(){
+    url <- "https://julialang-s3.julialang.org/bin/versions.json"
+    file <- tempfile()
+    utils::download.file(url, file)
+    versions <- rjson::fromJSON(file=file)
+
+    # Find the latest LTS version (currently 1.10.x series)
+    lts_versions <- names(Filter(function(v) v$stable && isTRUE(v$lts), versions))
+    if (length(lts_versions) > 0) {
+        max(numeric_version(lts_versions))
+    } else {
+        # Fallback to latest stable if no LTS is marked
+        julia_latest_version()
+    }
+}
+
 
 julia_url <- function(version){
     sysmachine <- Sys.info()["machine"]
@@ -73,8 +97,9 @@ julia_save_install_dir <- function(dir){
 #' Install Julia.
 #'
 #' @param version The version of Julia to install (e.g. \code{"1.6.3"}).
-#'                Defaults to \code{"latest"}, which will install the most
-#'                recent stable release.
+#'                Defaults to \code{"lts"}, which will install the current
+#'                Long Term Support release. Can also be \code{"latest"} for
+#'                the most recent stable release.
 #' @param prefix the directory where Julia will be installed.
 #'     If not set, a default location will be determined by \code{rappdirs}
 #'     if it is installed, otherwise an error will be raised.
@@ -88,6 +113,8 @@ install_julia <- function(version = "latest",
 
     if (version == "latest") {
         version <- julia_latest_version()
+    } else if (version == "lts") {
+        version <- julia_lts_version()
     }
     url <- julia_url(version)
 

R/zzz.R

@@ -24,8 +24,9 @@
 #'     If a new version of R is used, then this parameter needs to be set to TRUE.
 #' @param sysimage_path path to the precompiled custom sys image.
 #'     Path can be either an absolute path or relative to the current directory.
-#' @param version the version of Julia to install. Defaults to "latest", which is the latest
-#'     released version of Julia. You can use "1.10" for example for Julia v1.10.
+#' @param version the version of Julia to install. Defaults to "latest", which is the current
+#'     latest version of Julia. You can also use "lts" for the most recent 
+#'     long term stable release, or specify a version like "1.10".
 #' @return The julia interface, which is an environment with the necessary methods
 #'   like command, source and things like that to communicate with julia.
 #'

inst/julia/install_dependency.jl

@@ -32,11 +32,37 @@ function installed(name)
 end
 
 if installed("Suppressor") == nothing
-    Pkg.add("Suppressor")
+    # Use try-catch to handle potential package conflicts on ARM64
+    try
+        Pkg.add("Suppressor")
+    catch e
+        @warn "Failed to install Suppressor directly, trying to resolve in isolated environment" exception=e
+        # Create a temporary isolated environment to avoid conflicts
+        temp_env = mktempdir()
+        Pkg.activate(temp_env)
+        Pkg.add("Suppressor")
+        Pkg.activate() # Return to default environment
+        # Now try again in the main environment
+        Pkg.add("Suppressor")
+    end
 end;
 
 using Suppressor
 
 if installed("RCall") == nothing
-    Pkg.add("RCall")
+    # Use try-catch to handle potential package conflicts on ARM64
+    try
+        Pkg.add("RCall")
+    catch e
+        @warn "Failed to install RCall directly, trying to resolve in isolated environment" exception=e
+        # For RCall, we need to be more careful as it needs to be in the main environment
+        # Try to update registry first which often fixes ARM64 issues
+        try
+            Pkg.Registry.update()
+        catch
+            @warn "Could not update registry"
+        end
+        # Try again after registry update
+        Pkg.add("RCall")
+    end
 end;