move .onLoad call to setup, try using backports::R_user_dir again

japhir · Mar 5, 2024 · fcba204 · fcba204
1 parent d0fc842
commit fcba204
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -4,4 +4,5 @@ export(.data)
 export(get_solution)
 export(prepare_solution)
 export(snvec)
+if (getRversion() >= "4.0.0") {importFrom(tools,R_user_dir)} else {importFrom(backports,tools)}
 importFrom(rlang,.data)
diff --git a/R/get_solution.R b/R/get_solution.R
@@ -242,7 +242,3 @@ basename(raw_path)}} to cache.",
     return(raw)
   }
 }
-
-.onLoad <- function(libname, pkgname) {
-  backports::import(pkgname, "R_user_dir")
-}
diff --git a/R/snvecR-package.R b/R/snvecR-package.R
@@ -13,5 +13,6 @@
 # ' @importFrom tibble tibble
 # ' @importFrom tidyselect all_of
 # ' @importFrom utils menu
+#' @rawNamespace if (getRversion() >= "4.0.0") {importFrom(tools,R_user_dir)} else {importFrom(backports,tools)}
 ## usethis namespace: end
 NULL
diff --git a/man/snvec.Rd b/man/snvec.Rd
diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R
@@ -1,5 +1,9 @@
+.onLoad <- function(libname, pkgname) {
+  backports::import(pkgname, c("R_user_dir"))
+}
+
 cleanup <- function() {
-  cachedir <- tools::R_user_dir("snvecR", which = "cache")
+  cachedir <- R_user_dir("snvecR", which = "cache")
   if (dir.exists(cachedir) && !interactive()) {
     cli::cli_inform("Removing {.file {cachedir}} from reproducible environment.")
     unlink(cachedir, recursive = TRUE)