Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions renv/activate.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
local({

# the requested version of renv
version <- "1.0.9"
version <- "1.0.11"
attr(version, "sha") <- NULL

# the project directory
Expand Down Expand Up @@ -368,8 +368,7 @@ local({
quiet = TRUE
)

if ("headers" %in% names(formals(utils::download.file)))
{
if ("headers" %in% names(formals(utils::download.file))) {
headers <- renv_bootstrap_download_custom_headers(url)
if (length(headers) && is.character(headers))
args$headers <- headers
Expand Down Expand Up @@ -457,9 +456,8 @@ local({

# add custom headers if available -- note that
# utils::available.packages() will pass this to download.file()
if ("headers" %in% names(formals(utils::download.file)))
{
headers <- renv_bootstrap_download_custom_headers(url)
if ("headers" %in% names(formals(utils::download.file))) {
headers <- renv_bootstrap_download_custom_headers(repos)
if (length(headers) && is.character(headers))
args$headers <- headers
}
Expand Down
63 changes: 32 additions & 31 deletions renv/profiles/lesson-requirements/renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
},
"Matrix": {
"Package": "Matrix",
"Version": "1.7-0",
"Version": "1.7-1",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"grDevices",
Expand All @@ -69,7 +69,7 @@
"stats",
"utils"
],
"Hash": "1920b2f11133b12350024297d8a4ff4a"
"Hash": "5122bb14d8736372411f955e1b16bc8a"
},
"R6": {
"Package": "R6",
Expand All @@ -93,14 +93,14 @@
},
"Rcpp": {
"Package": "Rcpp",
"Version": "1.0.13",
"Version": "1.0.13-1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"methods",
"utils"
],
"Hash": "f27411eb6d9c3dada5edd444b8416675"
"Hash": "6b868847b365672d6c1677b1608da9ed"
},
"base64enc": {
"Package": "base64enc",
Expand Down Expand Up @@ -261,13 +261,13 @@
},
"evaluate": {
"Package": "evaluate",
"Version": "1.0.0",
"Version": "1.0.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R"
],
"Hash": "6b567375113ceb7d9f800de4dd42218e"
"Hash": "3fd29944b231036ad67c3edb32e02201"
},
"fansi": {
"Package": "fansi",
Expand Down Expand Up @@ -309,14 +309,14 @@
},
"fs": {
"Package": "fs",
"Version": "1.6.4",
"Version": "1.6.5",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"methods"
],
"Hash": "15aeb8c27f5ea5161f9f6a641fafd93a"
"Hash": "7f48af39fa27711ea5fbd183b399920d"
},
"generics": {
"Package": "generics",
Expand Down Expand Up @@ -367,7 +367,7 @@
},
"gtable": {
"Package": "gtable",
"Version": "0.3.5",
"Version": "0.3.6",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -376,9 +376,10 @@
"glue",
"grid",
"lifecycle",
"rlang"
"rlang",
"stats"
],
"Hash": "e18861963cbc65a27736e02b3cd3c4a0"
"Hash": "de949855009e2d4d0e52a844e30617ae"
},
"highr": {
"Package": "highr",
Expand Down Expand Up @@ -556,7 +557,7 @@
"Package": "nlme",
"Version": "3.1-166",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"graphics",
Expand Down Expand Up @@ -643,7 +644,7 @@
},
"raster": {
"Package": "raster",
"Version": "3.6-26",
"Version": "3.6-30",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -653,17 +654,17 @@
"sp",
"terra"
],
"Hash": "7d6eda494f34a644420ac1bfd2a8023a"
"Hash": "0e2829df8cb74a98179c886b023ffea8"
},
"renv": {
"Package": "renv",
"Version": "1.0.9",
"Version": "1.0.11",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"utils"
],
"Hash": "ef233f0e9064fc88c898b340c9add5c2"
"Hash": "47623f66b4e80b3b0587bc5d7b309888"
},
"reshape": {
"Package": "reshape",
Expand All @@ -689,7 +690,7 @@
},
"rmarkdown": {
"Package": "rmarkdown",
"Version": "2.28",
"Version": "2.29",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -708,7 +709,7 @@
"xfun",
"yaml"
],
"Hash": "062470668513dcda416927085ee9bdc7"
"Hash": "df99277f63d01c34e95e3d2f06a79736"
},
"s2": {
"Package": "s2",
Expand Down Expand Up @@ -758,7 +759,7 @@
},
"sf": {
"Package": "sf",
"Version": "1.0-17",
"Version": "1.0-18",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -777,7 +778,7 @@
"units",
"utils"
],
"Hash": "453a7d0263eae87a7831242a74fe9b60"
"Hash": "801bec14b3bae0f37eef4d187ee0bb44"
},
"sp": {
"Package": "sp",
Expand Down Expand Up @@ -828,15 +829,15 @@
},
"terra": {
"Package": "terra",
"Version": "1.7-78",
"Version": "1.7-83",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"Rcpp",
"methods"
],
"Hash": "8f020def0792119cb98bd8f696dab22d"
"Hash": "fbeffe988419d292225a57cf9c284802"
},
"tibble": {
"Package": "tibble",
Expand Down Expand Up @@ -898,13 +899,13 @@
},
"tinytex": {
"Package": "tinytex",
"Version": "0.53",
"Version": "0.54",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"xfun"
],
"Hash": "9db859e8aabbb474293dde3097839420"
"Hash": "3ec7e3ddcacc2d34a9046941222bf94d"
},
"units": {
"Package": "units",
Expand Down Expand Up @@ -953,29 +954,29 @@
},
"withr": {
"Package": "withr",
"Version": "3.0.1",
"Version": "3.0.2",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"grDevices",
"graphics"
],
"Hash": "07909200e8bbe90426fbfeb73e1e27aa"
"Hash": "cc2d62c76458d425210d1eb1478b30b4"
},
"wk": {
"Package": "wk",
"Version": "0.9.3",
"Version": "0.9.4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R"
],
"Hash": "9ca478d7cb1450b42dcb8af2ea5681cc"
"Hash": "37be35d733130f1de1ef51672cf7cdc0"
},
"xfun": {
"Package": "xfun",
"Version": "0.47",
"Version": "0.49",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -984,7 +985,7 @@
"stats",
"tools"
],
"Hash": "36ab21660e2d095fef0d83f689e0477c"
"Hash": "8687398773806cfff9401a2feca96298"
},
"yaml": {
"Package": "yaml",
Expand Down
Loading