From 15274666b0b35b4fce579e664fe20fdee2c4b7d9 Mon Sep 17 00:00:00 2001
From: Carson <cpsievert1@gmail.com>
Date: Thu, 7 Sep 2023 16:33:17 -0500
Subject: [PATCH] Try out another approach

---
 R/data-shinyverse.R                       | 2 --
 inst/gha/gha-adjust-packages-to-install.R | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/R/data-shinyverse.R b/R/data-shinyverse.R
index fe4ce1b781..eacd4028dc 100644
--- a/R/data-shinyverse.R
+++ b/R/data-shinyverse.R
@@ -17,8 +17,6 @@ shinyverse_remotes <- c(
   "rstudio/htmltools",
   "rstudio/httpuv",
   "rstudio/leaflet",
-  # Temporary fix for install issues with terra on old versions of R
-  "rspatial/terra",
   "rstudio/pool",
   "rstudio/promises",
   "rstudio/reactlog",
diff --git a/inst/gha/gha-adjust-packages-to-install.R b/inst/gha/gha-adjust-packages-to-install.R
index c655d6aa33..0bf0c66ae9 100644
--- a/inst/gha/gha-adjust-packages-to-install.R
+++ b/inst/gha/gha-adjust-packages-to-install.R
@@ -14,6 +14,10 @@ adjust_pkgs <- function(pkgs_to_install = "rstudio/shiny,rstudio/bslib", r_versi
       }
   }
 
+  if (as.package_version(r_version) < as.package_version("4.1")) {
+    replace_or_add("any::terra", "rspatial/terra")
+  }
+
   if (is_linux) {
     switch(short_r_version,
       "4.2" = {