diff --git a/renv.lock b/renv.lock index e51f48f..e96c68e 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.0.2", + "Version": "4.2.1", "Repositories": [ { "Name": "CRAN", @@ -11,29 +11,27 @@ "Packages": { "DBI": { "Package": "DBI", - "Version": "1.1.2", + "Version": "1.1.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "dcd1743af4336156873e3ce3c950b8b9", + "Hash": "b2866e62bab9378c3cc9476a1954226b", "Requirements": [] }, "MASS": { "Package": "MASS", - "Version": "7.3-56", + "Version": "7.3-58.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "af0e1955cb80bb36b7988cc657db261e", + "Hash": "762e1804143a332333c054759f89a706", "Requirements": [] }, "Matrix": { "Package": "Matrix", - "Version": "1.4-1", + "Version": "1.5-1", "Source": "Repository", "Repository": "CRAN", - "Hash": "699c47c606293bdfbc9fd78a93c9c8fe", - "Requirements": [ - "lattice" - ] + "Hash": "539dc0c0c05636812f1080f473d2c177", + "Requirements": [] }, "R6": { "Package": "R6", @@ -53,18 +51,18 @@ }, "Rcpp": { "Package": "Rcpp", - "Version": "1.0.8.3", + "Version": "1.0.9", "Source": "Repository", "Repository": "CRAN", - "Hash": "32e79b908fda56ee57fe518a8d37b864", + "Hash": "e9c08b94391e9f3f97355841229124f2", "Requirements": [] }, "RcppArmadillo": { "Package": "RcppArmadillo", - "Version": "0.10.8.1.0", + "Version": "0.11.2.4.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "303dcd8a3fca86087e341ed5cc360abf", + "Hash": "796805fe55a25e42b5e0aeefacc041dc", "Requirements": [ "Rcpp" ] @@ -175,10 +173,10 @@ }, "broom": { "Package": "broom", - "Version": "0.7.12", + "Version": "1.0.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "bfa8a039d77ae8d5413254e572c8abea", + "Hash": "c90ff735b7812b60f067a3f7a3b4de63", "Requirements": [ "backports", "dplyr", @@ -240,10 +238,10 @@ }, "callr": { "Package": "callr", - "Version": "3.7.0", + "Version": "3.7.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "461aa75a11ce2400245190ef5d3995df", + "Hash": "358689cac9fe93b1bb3a19088d2dbed8", "Requirements": [ "R6", "processx" @@ -251,13 +249,11 @@ }, "cli": { "Package": "cli", - "Version": "3.2.0", + "Version": "3.4.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "1bdb126893e9ce6aae50ad1d6fc32faf", - "Requirements": [ - "glue" - ] + "Hash": "78003c09d258968a4d28107e779edb10", + "Requirements": [] }, "clipr": { "Package": "clipr", @@ -342,7 +338,6 @@ "ellipse", "ggplot2", "ggrepel", - "mgcv", "reshape2", "scales", "stringr", @@ -364,29 +359,30 @@ }, "devtools": { "Package": "devtools", - "Version": "2.4.3", + "Version": "2.4.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "fc35e13bb582e5fe6f63f3d647a4cbe5", + "Hash": "d6ad91ae6533b84d227bb0b5262c111f", "Requirements": [ - "callr", "cli", "desc", "ellipsis", "fs", - "httr", "lifecycle", "memoise", + "miniUI", "pkgbuild", + "pkgdown", "pkgload", + "profvis", "rcmdcheck", "remotes", "rlang", "roxygen2", - "rstudioapi", "rversions", "sessioninfo", "testthat", + "urlchecker", "usethis", "withr" ] @@ -409,12 +405,31 @@ "Hash": "cf6b206a045a684728c3267ef7596190", "Requirements": [] }, + "downlit": { + "Package": "downlit", + "Version": "0.4.2", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "79bf3f66590752ffbba20f8d2da94c7c", + "Requirements": [ + "brio", + "desc", + "digest", + "evaluate", + "fansi", + "memoise", + "rlang", + "vctrs", + "withr", + "yaml" + ] + }, "dplyr": { "Package": "dplyr", - "Version": "1.0.8", + "Version": "1.0.10", "Source": "Repository", "Repository": "CRAN", - "Hash": "ef47665e64228a17609d6df877bf86f2", + "Hash": "539412282059f7f0c07295723d23f987", "Requirements": [ "R6", "generics", @@ -430,10 +445,10 @@ }, "ellipse": { "Package": "ellipse", - "Version": "0.4.2", + "Version": "0.4.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "bfa61f1a00c0d30b86bf13d35748e24c", + "Hash": "feedb4386d9c3c157989ca7af419c892", "Requirements": [] }, "ellipsis": { @@ -464,10 +479,10 @@ }, "farver": { "Package": "farver", - "Version": "2.1.0", + "Version": "2.1.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "c98eb5133d9cb9e1622b8691487f11bb", + "Hash": "8106d78941f34855c440ddb946b8f7a5", "Requirements": [] }, "fastmap": { @@ -520,10 +535,10 @@ }, "gert": { "Package": "gert", - "Version": "1.6.0", + "Version": "1.9.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "98c014c4c933f23ea5a0321a4d0b588b", + "Hash": "56dc795889978f759ea0b0de06dcd5b4", "Requirements": [ "askpass", "credentials", @@ -545,7 +560,6 @@ "glue", "gtable", "isoband", - "mgcv", "rlang", "scales", "tibble", @@ -673,10 +687,10 @@ }, "hms": { "Package": "hms", - "Version": "1.1.1", + "Version": "1.1.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "5b8a2dd0fdbe2ab4f6081e6c7be6dfca", + "Hash": "41100392191e1244b887878b533eea91", "Requirements": [ "ellipsis", "lifecycle", @@ -687,10 +701,10 @@ }, "htmltools": { "Package": "htmltools", - "Version": "0.5.2", + "Version": "0.5.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "526c484233f42522278ab06fb185cb26", + "Hash": "6496090a9e00f8354b811d1a2d47b566", "Requirements": [ "base64enc", "digest", @@ -712,10 +726,10 @@ }, "httpuv": { "Package": "httpuv", - "Version": "1.6.5", + "Version": "1.6.6", "Source": "Repository", "Repository": "CRAN", - "Hash": "97fe71f0a4a1c9890e6c2128afa04bc0", + "Hash": "fd090e236ae2dc0f0cdf33a9ec83afb6", "Requirements": [ "R6", "Rcpp", @@ -804,20 +818,12 @@ "rlang" ] }, - "lattice": { - "Package": "lattice", - "Version": "0.20-45", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "b64cdbb2b340437c4ee047a1f4c4377b", - "Requirements": [] - }, "lifecycle": { "Package": "lifecycle", - "Version": "1.0.1", + "Version": "1.0.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "a6b6d352e3ed897373ab19d8395c98d0", + "Hash": "25f74670fa7d3277fe3ad8c1712a699f", "Requirements": [ "glue", "rlang" @@ -853,17 +859,6 @@ "rlang" ] }, - "mgcv": { - "Package": "mgcv", - "Version": "1.8-40", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "c6b2fdb18cf68ab613bd564363e1ba0d", - "Requirements": [ - "Matrix", - "nlme" - ] - }, "mice": { "Package": "mice", "Version": "3.14.0", @@ -876,7 +871,6 @@ "cpp11", "dplyr", "generics", - "lattice", "rlang", "tidyr", "withr" @@ -884,10 +878,10 @@ }, "miceadds": { "Package": "miceadds", - "Version": "3.11-6", + "Version": "3.14-3", "Source": "Repository", "Repository": "CRAN", - "Hash": "b7768955403cc231f24955fc30dde4c4", + "Hash": "c823dad6b58ef2e70486de9c8234e4fa", "Requirements": [ "Rcpp", "RcppArmadillo", @@ -903,6 +897,17 @@ "Hash": "18e9c28c1d3ca1560ce30658b22ce104", "Requirements": [] }, + "miniUI": { + "Package": "miniUI", + "Version": "0.1.1.1", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "fec5f52652d60615fdb3957b3d74324a", + "Requirements": [ + "htmltools", + "shiny" + ] + }, "mitools": { "Package": "mitools", "Version": "2.4", @@ -925,30 +930,28 @@ }, "nlme": { "Package": "nlme", - "Version": "3.1-157", + "Version": "3.1-159", "Source": "Repository", "Repository": "CRAN", - "Hash": "dbca60742be0c9eddc5205e5c7ca1f44", - "Requirements": [ - "lattice" - ] + "Hash": "4a0b3a68f846cb999ff0e8e519524fbb", + "Requirements": [] }, "openssl": { "Package": "openssl", - "Version": "2.0.0", + "Version": "2.0.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "cf4329aac12c2c44089974559c18e446", + "Hash": "b9621e75c0652041002a19609fb23c5a", "Requirements": [ "askpass" ] }, "packrat": { "Package": "packrat", - "Version": "0.7.0", + "Version": "0.8.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "95e8c3825efcaad09411799da92c0af9", + "Hash": "d84055adcb6bb1f4f0ce8c5f235bc328", "Requirements": [] }, "parsedate": { @@ -1000,28 +1003,58 @@ "Hash": "01f28d4278f15c76cddbea05899c5d6f", "Requirements": [] }, + "pkgdown": { + "Package": "pkgdown", + "Version": "2.0.6", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "f958d0b2a5dabc5ffd414f062b1ffbe7", + "Requirements": [ + "bslib", + "callr", + "cli", + "desc", + "digest", + "downlit", + "fs", + "httr", + "jsonlite", + "magrittr", + "memoise", + "purrr", + "ragg", + "rlang", + "rmarkdown", + "tibble", + "whisker", + "withr", + "xml2", + "yaml" + ] + }, "pkgload": { "Package": "pkgload", - "Version": "1.2.4", + "Version": "1.3.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "7533cd805940821bf23eaf3c8d4c1735", + "Hash": "4b20f937a363c78a5730265c1925f54a", "Requirements": [ "cli", "crayon", "desc", + "fs", + "glue", "rlang", "rprojroot", - "rstudioapi", "withr" ] }, "plyr": { "Package": "plyr", - "Version": "1.8.6", + "Version": "1.8.7", "Source": "Repository", "Repository": "CRAN", - "Hash": "ec0e5ab4e5f851f6ef32cd1d1984957f", + "Hash": "9c17c6ee41639ebdc1d7266546d3b627", "Requirements": [ "Rcpp" ] @@ -1044,15 +1077,26 @@ }, "processx": { "Package": "processx", - "Version": "3.5.3", + "Version": "3.7.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "8bbae1a548d0d3fdf6647bdd9d35bf6d", + "Hash": "f91df0f5f31ffdf88bc0b624f5ebab0f", "Requirements": [ "R6", "ps" ] }, + "profvis": { + "Package": "profvis", + "Version": "0.3.7", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "e9d21e79848e02e524bea6f5bd53e7e4", + "Requirements": [ + "htmlwidgets", + "stringr" + ] + }, "progress": { "Package": "progress", "Version": "1.2.2", @@ -1082,10 +1126,10 @@ }, "ps": { "Package": "ps", - "Version": "1.6.0", + "Version": "1.7.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "32620e2001c1dce1af49c49dccbb9420", + "Hash": "8b93531308c01ad0e56d9eadcc0c4fcd", "Requirements": [] }, "purrr": { @@ -1099,6 +1143,17 @@ "rlang" ] }, + "ragg": { + "Package": "ragg", + "Version": "1.2.2", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "14932bb6f2739c771ca4ceaba6b4248e", + "Requirements": [ + "systemfonts", + "textshaping" + ] + }, "rappdirs": { "Package": "rappdirs", "Version": "0.3.3", @@ -1176,10 +1231,10 @@ }, "renv": { "Package": "renv", - "Version": "0.15.4", + "Version": "0.15.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "c1078316e1d4f70275fc1ea60c0bc431", + "Hash": "6a38294e7d12f5d8e656b08c5bd8ae34", "Requirements": [] }, "reshape2": { @@ -1225,10 +1280,10 @@ }, "rlang": { "Package": "rlang", - "Version": "1.0.2", + "Version": "1.0.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "04884d9a75d778aca22c7154b8333ec9", + "Hash": "971c3d698fc06dabdac6bc4bcda72dc4", "Requirements": [] }, "rmarkdown": { @@ -1252,13 +1307,14 @@ }, "roxygen2": { "Package": "roxygen2", - "Version": "7.1.2", + "Version": "7.2.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "eb9849556c4250305106e82edae35b72", + "Hash": "da1f278262e563c835345872f2fef537", "Requirements": [ "R6", "brew", + "cli", "commonmark", "cpp11", "desc", @@ -1269,6 +1325,7 @@ "rlang", "stringi", "stringr", + "withr", "xml2" ] }, @@ -1282,10 +1339,10 @@ }, "rsconnect": { "Package": "rsconnect", - "Version": "0.8.25", + "Version": "0.8.27", "Source": "Repository", "Repository": "CRAN", - "Hash": "c78e0acc405a6990475f1f9500ebe66c", + "Hash": "114103fbb50af041e93921ee67db8fa0", "Requirements": [ "curl", "digest", @@ -1304,26 +1361,12 @@ "Hash": "690bd2acc42a9166ce34845884459320", "Requirements": [] }, - "rticles": { - "Package": "rticles", - "Version": "0.23", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "4cab3463b39137d4dd113b751cb2805d", - "Requirements": [ - "knitr", - "rmarkdown", - "tinytex", - "xfun", - "yaml" - ] - }, "rversions": { "Package": "rversions", - "Version": "2.1.1", + "Version": "2.1.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "f88fab00907b312f8b23ec13e2d437cb", + "Hash": "a9881dfed103e83f9de151dc17002cd1", "Requirements": [ "curl", "xml2" @@ -1331,10 +1374,10 @@ }, "sass": { "Package": "sass", - "Version": "0.4.1", + "Version": "0.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "f37c0028d720bab3c513fd65d28c7234", + "Hash": "1b191143d7d3444d504277843f3a95fe", "Requirements": [ "R6", "fs", @@ -1414,10 +1457,10 @@ }, "shinybusy": { "Package": "shinybusy", - "Version": "0.3.0", + "Version": "0.3.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "f64f08367358906d34a0ff490838d71c", + "Hash": "cf0b9330f677599316a4b36682081e8b", "Requirements": [ "htmltools", "htmlwidgets", @@ -1447,10 +1490,10 @@ }, "stringi": { "Package": "stringi", - "Version": "1.7.6", + "Version": "1.7.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "bba431031d30789535745a9627ac9271", + "Hash": "a68b980681bcbc84c7a67003fa796bfb", "Requirements": [] }, "stringr": { @@ -1473,12 +1516,22 @@ "Hash": "b227d13e29222b4574486cfcbde077fa", "Requirements": [] }, + "systemfonts": { + "Package": "systemfonts", + "Version": "1.0.4", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "90b28393209827327de889f49935140a", + "Requirements": [ + "cpp11" + ] + }, "testthat": { "Package": "testthat", - "Version": "3.1.2", + "Version": "3.1.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "32454e5780e8dbe31e4b61b13d8918fe", + "Hash": "f76c2a02d0fdc24aa7a47ea34261a6e3", "Requirements": [ "R6", "brio", @@ -1501,14 +1554,24 @@ "withr" ] }, + "textshaping": { + "Package": "textshaping", + "Version": "0.3.6", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "1ab6223d3670fac7143202cb6a2d43d5", + "Requirements": [ + "cpp11", + "systemfonts" + ] + }, "tibble": { "Package": "tibble", - "Version": "3.1.6", + "Version": "3.1.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "8a8f02d1934dfd6431c671361510dd0b", + "Hash": "56b6934ef0f8c68225949a8672fe1a8f", "Requirements": [ - "ellipsis", "fansi", "lifecycle", "magrittr", @@ -1520,10 +1583,10 @@ }, "tidyr": { "Package": "tidyr", - "Version": "1.2.0", + "Version": "1.2.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "d8b95b7fee945d7da6888cf7eb71a49c", + "Hash": "cdb403db0de33ccd1b6f53b83736efa8", "Requirements": [ "cpp11", "dplyr", @@ -1593,14 +1656,26 @@ }, "tzdb": { "Package": "tzdb", - "Version": "0.2.0", + "Version": "0.3.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "5e069fb033daf2317bd628d3100b75c5", + "Hash": "b2e1cbce7c903eaf23ec05c58e59fb5e", "Requirements": [ "cpp11" ] }, + "urlchecker": { + "Package": "urlchecker", + "Version": "1.0.1", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "409328b8e1253c8d729a7836fe7f7a16", + "Requirements": [ + "cli", + "curl", + "xml2" + ] + }, "usethis": { "Package": "usethis", "Version": "2.1.6", @@ -1702,10 +1777,10 @@ }, "waldo": { "Package": "waldo", - "Version": "0.3.1", + "Version": "0.4.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "ad8cfff5694ac5b3c354f8f2044bd976", + "Hash": "035fba89d0c86e2113120f93301b98ad", "Requirements": [ "cli", "diffobj", @@ -1745,10 +1820,10 @@ }, "xfun": { "Package": "xfun", - "Version": "0.30", + "Version": "0.33", "Source": "Repository", "Repository": "CRAN", - "Hash": "e83f48136b041845e50a6658feffb197", + "Hash": "1a666f915cd65072f4ccf5b2888d5d39", "Requirements": [] }, "xml2": { @@ -1787,10 +1862,10 @@ }, "zip": { "Package": "zip", - "Version": "2.2.0", + "Version": "2.2.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "c7eef2996ac270a18c2715c997a727c5", + "Hash": "a7e91189fa51d9029a30eba3831ce53f", "Requirements": [] } } diff --git a/renv/activate.R b/renv/activate.R index e961251..72c0818 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,7 +2,7 @@ local({ # the requested version of renv - version <- "0.15.4" + version <- "0.15.5" # the project directory project <- getwd() @@ -54,7 +54,7 @@ local({ # mask 'utils' packages, will come first on the search path library(utils, lib.loc = .Library) - # unload renv if it's already been laoded + # unload renv if it's already been loaded if ("renv" %in% loadedNamespaces()) unloadNamespace("renv") @@ -314,9 +314,18 @@ local({ } # bail if it doesn't exist - if (!file.exists(tarball)) + if (!file.exists(tarball)) { + + # let the user know we weren't able to honour their request + fmt <- "* RENV_BOOTSTRAP_TARBALL is set (%s) but does not exist." + msg <- sprintf(fmt, tarball) + warning(msg) + + # bail return() + } + fmt <- "* Bootstrapping with tarball at path '%s'." msg <- sprintf(fmt, tarball) message(msg) @@ -800,7 +809,7 @@ local({ # find strings in the JSON pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' - locs <- gregexpr(pattern, text)[[1]] + locs <- gregexpr(pattern, text, perl = TRUE)[[1]] # if any are found, replace them with placeholders replaced <- text